diff options
Diffstat (limited to 'meta')
-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 @@ | |||
1 | From df06b8170745eac347acb95f9f374f257621254f Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 29 Jan 2015 18:11:00 -0800 | ||
4 | Subject: [PATCH] Makefile.in: fix for parallel build | ||
5 | |||
6 | Fixed: | ||
7 | * do_compile | ||
8 | pth_uctx.c:31:19: fatal error: pth_p.h: No such file or directory | ||
9 | #include "pth_p.h" | ||
10 | ^ | ||
11 | compilation terminated. | ||
12 | make: *** [pth_uctx.lo] Error 1 | ||
13 | |||
14 | * do_install: | ||
15 | cp: cannot create regular file `image/usr/lib/pkgconfig/#INST@15507#': No such file or directory | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
19 | --- | ||
20 | Makefile.in | 5 +++-- | ||
21 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/Makefile.in b/Makefile.in | ||
24 | index de0390d..381a0ee 100644 | ||
25 | --- a/Makefile.in | ||
26 | +++ b/Makefile.in | ||
27 | @@ -219,7 +219,8 @@ test_pthread: test_pthread.o test_common.o libpthread.la | ||
28 | |||
29 | # install the package | ||
30 | install: all-for-install | ||
31 | - @$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA | ||
32 | + @$(MAKE) $(MKFLAGS) install-dirs | ||
33 | + @$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@ install-pkgconfigDATA | ||
34 | @touch .done-install >/dev/null 2>&1 || $(TRUE) | ||
35 | @$(MAKE) $(MKFLAGS) what-next | ||
36 | install-dirs: | ||
37 | @@ -432,7 +433,7 @@ TAGS: | ||
38 | ## (AUTOMATICALLY UPDATED - DO NOT EDIT) | ||
39 | ## | ||
40 | |||
41 | -$(LOBJS): Makefile | ||
42 | +$(LOBJS): Makefile pth_p.h | ||
43 | |||
44 | # DO NOT REMOVE | ||
45 | pth_attr.lo: pth_attr.c pth_p.h pth_vers.c pth.h pth_acdef.h pth_acmac.h | ||
46 | -- | ||
47 | 1.7.9.5 | ||
48 | |||
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 () { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ | 15 | SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ |
16 | file://pth-add-pkgconfig-support.patch" | 16 | file://pth-add-pkgconfig-support.patch \ |
17 | file://pth-fix-parallel.patch \ | ||
18 | " | ||
17 | 19 | ||
18 | SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" | 20 | SRC_URI[md5sum] = "9cb4a25331a4c4db866a31cbe507c793" |
19 | SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" | 21 | SRC_URI[sha256sum] = "72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232" |
20 | 22 | ||
21 | PARALLEL_MAKE="" | ||
22 | |||
23 | BINCONFIG = "${bindir}/pth-config" | 23 | BINCONFIG = "${bindir}/pth-config" |
24 | 24 | ||
25 | inherit autotools binconfig-disabled pkgconfig | 25 | inherit autotools binconfig-disabled pkgconfig |