diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-29 17:33:35 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 22:26:10 +0000 |
| commit | 38cbca47bb6cf5bb2c399c665520c1e207eb6734 (patch) | |
| tree | 4426de65b419e9ef2e977846dc1857ddbeb1a0f9 /meta/recipes-support | |
| parent | 4ec82250945bc8e2f3e8d246bcba2cfede933773 (diff) | |
| download | openembedded-core-38cbca47bb6cf5bb2c399c665520c1e207eb6734.tar.gz openembedded-core-38cbca47bb6cf5bb2c399c665520c1e207eb6734.tar.bz2 openembedded-core-38cbca47bb6cf5bb2c399c665520c1e207eb6734.zip | |
pth: fix and enable parallel build
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/pth/files/pth-fix-parallel.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-support/pth/pth_2.0.7.bb | 6 |
2 files changed, 51 insertions, 3 deletions
diff --git a/meta/recipes-support/pth/files/pth-fix-parallel.patch b/meta/recipes-support/pth/files/pth-fix-parallel.patch new file mode 100644 index 0000000000..08edaff157 --- /dev/null +++ b/meta/recipes-support/pth/files/pth-fix-parallel.patch @@ -0,0 +1,48 @@ +From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 29 Jan 2015 18:11:00 -0800 +Subject: [PATCH] Makefile.in: fix for parallel build + +Fixed: +* do_compile + pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory + #include "pth_p.h" + ^ +compilation terminated. +make: *** [pth_uctx.lo] Error 1 + +* do_install: + cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory + +Upstream-Status: Pending +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index de0390d..381a0ee 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la + + # install the package + install: all-for-install +- @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA ++ @$(MAKE) $(MKFLAGS) install-dirs ++ @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA + @touch .done-install >/dev/null 2>&1 || $(TRUE) + @$(MAKE) $(MKFLAGS) what-next + install-dirs: +@@ -432,7 +433,7 @@ TAGS: + ## (AUTOMATICALLY UPDATED - DO NOT EDIT) + ## + +-$(LOBJS): Makefile ++$(LOBJS): Makefile pth_p.h + + # DO NOT REMOVE + pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h +-- +1.7.9.5 + diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb index 416e788e5d..9037769b79 100644 --- a/meta/recipes-support/pth/pth_2.0.7.bb +++ b/meta/recipes-support/pth/pth_2.0.7.bb @@ -13,13 +13,13 @@ python __anonymous () { } SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ - file://pth-add-pkgconfig-support.patch" + file://pth-add-pkgconfig-support.patch \ + file://pth-fix-parallel.patch \ + " SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" -PARALLEL_MAKE="" - BINCONFIG = "${bindir}/pth-config" inherit autotools binconfig-disabled pkgconfig |