Patchwork [2/3] icu-3.6: fix building with big make -j

login
register
mail settings
Submitter lumag
Date Sept. 3, 2011, 6:22 p.m.
Message ID <1315074165-20137-2-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/10937/
State New, archived
Headers show

Comments

lumag - Sept. 3, 2011, 6:22 p.m.
icu-3.6 buildsystem contains small problem which causes some parallel
builds to fail. Fix that.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../icu/files/fix-parallel-build.patch             |   19 +++++++++++++++++++
 meta/recipes-support/icu/icu-3.6.inc               |    1 +
 2 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch
Richard Purdie - Sept. 5, 2011, 7:39 p.m.
On Sat, 2011-09-03 at 22:22 +0400, Dmitry Eremin-Solenikov wrote:
> icu-3.6 buildsystem contains small problem which causes some parallel
> builds to fail. Fix that.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
>  .../icu/files/fix-parallel-build.patch             |   19 +++++++++++++++++++
>  meta/recipes-support/icu/icu-3.6.inc               |    1 +
>  2 files changed, 20 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch

Merged to master, thanks.

Richard

Patch

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 0000000..5b01a4c
--- /dev/null
+++ b/meta/recipes-support/icu/files/fix-parallel-build.patch
@@ -0,0 +1,19 @@ 
+Upstream-Status: pending
+
+Fix parallel builds
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+
+Index: source/data/Makefile.in
+===================================================================
+--- source.orig/data/Makefile.in	2011-09-02 02:03:37.000000000 +0400
++++ source/data/Makefile.in	2011-09-02 02:06:26.000000000 +0400
+@@ -351,8 +351,8 @@
+ endif
+
+
+-build-dir: $(BUILD_DIRS)
+-$(BUILD_DIRS):
++$(MAINBUILDDIR) $(BUILD_DIRS): build-dir
++build-dir:
+	-$(MKINSTALLDIRS) $(BUILD_DIRS)
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bd..18efd16 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"
 
 BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
            file://gccfix.patch;apply=yes \
+           file://fix-parallel-build.patch \
            file://use-g++-for-linking.patch;apply=yes"
 SRC_URI = "${BASE_SRC_URI} \
            file://noldlibpath.patch;apply=yes"