diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2021-02-10 23:54:02 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-02-16 11:36:21 +0100 |
| commit | e223a4f45271cc3fecbdc99936641e0d680dd471 (patch) | |
| tree | 25030171ab2e0e44cf92309030218fab24cc8012 /meta/recipes-support/icu/icu | |
| parent | 8d296a0b708a1173b3e1266cb57edd3b4e1f5375 (diff) | |
| download | openembedded-core-contrib-e223a4f45271cc3fecbdc99936641e0d680dd471.tar.gz | |
icu: use git fetcher to bisect
* use dos2unix on 0001-Fix-big-endian-build.patch and
0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch
because the data directory in git uses unix endings while data
zip file used before uses dos endings
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-support/icu/icu')
| -rw-r--r-- | meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch b/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch index 91d68848c7..0062a37634 100644 --- a/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch +++ b/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch @@ -17,12 +17,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- a/data/Makefile.in +++ b/data/Makefile.in @@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard - # and convert it to the current type.
- ifneq ($(ICUDATA_ARCHIVE),)
- ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
--$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
-+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
-+ $(MKINSTALLDIRS) $(OUTDIR)
- $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
- endif
- else
+ # and convert it to the current type. + ifneq ($(ICUDATA_ARCHIVE),) + ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat +-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR) ++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) ++ $(MKINSTALLDIRS) $(OUTDIR) + $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE) + endif + else diff --git a/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch index d7ddf33bce..2b7b157c66 100644 --- a/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch +++ b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch @@ -13,12 +13,12 @@ diff --git a/data/BUILDRULES.py b/data/BUILDRULES.py index 2338afd1f7..63b6e09273 100644 --- a/data/BUILDRULES.py +++ b/data/BUILDRULES.py -@@ -361,7 +361,7 @@ def generate_misc(config, io, common_vars):
- RepeatedExecutionRequest(
- name = "misc_res",
- category = "misc",
-- dep_targets = [],
-+ dep_targets = [DepTarget("cnvalias")], # ICU-21175
- input_files = input_files,
- output_files = output_files,
- tool = IcuTool("genrb"),
+@@ -361,7 +361,7 @@ + RepeatedExecutionRequest( + name = "misc_res", + category = "misc", +- dep_targets = [], ++ dep_targets = [DepTarget("cnvalias")], # ICU-21175 + input_files = input_files, + output_files = output_files, + tool = IcuTool("genrb"), |