summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-03 22:22:44 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-06 16:37:02 +0100
commitdbff56238e083d0110eb13c1f5a07716340fdfe4 (patch)
treed3f7be6ef415ce6b8aa20f6b5317c05c0a99f99e
parent012611872991e7bfe58becda767bec68a178427d (diff)
downloadpoky-dbff56238e083d0110eb13c1f5a07716340fdfe4.tar.gz
icu-3.6: fix building with big make -j
icu-3.6 buildsystem contains small problem which causes some parallel builds to fail. Fix that. (From OE-Core rev: 41b7c955cfdc7b4d5c667c8a8742237d5edaca4f) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/icu/files/fix-parallel-build.patch19
-rw-r--r--meta/recipes-support/icu/icu-3.6.inc1
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-support/icu/files/fix-parallel-build.patch b/meta/recipes-support/icu/files/fix-parallel-build.patch
new file mode 100644
index 0000000000..5b01a4c26c
--- /dev/null
+++ b/meta/recipes-support/icu/files/fix-parallel-build.patch
@@ -0,0 +1,19 @@
1Upstream-Status: pending
2
3Fix parallel builds
4
5Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
6
7Index: source/data/Makefile.in
8===================================================================
9--- source.orig/data/Makefile.in 2011-09-02 02:03:37.000000000 +0400
10+++ source/data/Makefile.in 2011-09-02 02:06:26.000000000 +0400
11@@ -351,8 +351,8 @@
12 endif
13
14
15-build-dir: $(BUILD_DIRS)
16-$(BUILD_DIRS):
17+$(MAINBUILDDIR) $(BUILD_DIRS): build-dir
18+build-dir:
19 -$(MKINSTALLDIRS) $(BUILD_DIRS)
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bdf36..18efd169ec 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www-01.ibm.com/software/globalization/icu/index.jsp"
3 3
4BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \ 4BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
5 file://gccfix.patch;apply=yes \ 5 file://gccfix.patch;apply=yes \
6 file://fix-parallel-build.patch \
6 file://use-g++-for-linking.patch;apply=yes" 7 file://use-g++-for-linking.patch;apply=yes"
7SRC_URI = "${BASE_SRC_URI} \ 8SRC_URI = "${BASE_SRC_URI} \
8 file://noldlibpath.patch;apply=yes" 9 file://noldlibpath.patch;apply=yes"