* [PATCH 01/12] bind: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 02/12] tcp-wrappers: " Robert Yang
` (10 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../bind/bind/bind-subdirs-run-serially.patch | 35 ++++++++++++++++++++
meta/recipes-connectivity/bind/bind_9.9.5.bb | 2 +-
2 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch
diff --git a/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch
new file mode 100644
index 0000000..9db7a17
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch
@@ -0,0 +1,35 @@
+From b24468b6fe1f136bfd854773bc0e117aca0012d5 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 28 Jan 2015 01:23:09 -0800
+Subject: [PATCH] lib/export/isc/Makefile.in: let SUBDIRS run serially
+
+Fix parallel issue::
+make[2]: *** No rule to make target `nls/msgcat.o', needed by `libisc.a'. Stop.
+make[2]: *** Waiting for unfinished jobs....
+make[3]: Leaving directory `bind-9.9.5/lib/export/isc/unix'
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ lib/export/isc/Makefile.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in
+index a92f66f..27dabcb 100644
+--- a/lib/export/isc/Makefile.in
++++ b/lib/export/isc/Makefile.in
+@@ -103,6 +103,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
+
+ LIBS = @LIBS@
+
++# Note: the order of SUBDIRS is important.
++# Attempt to disable parallel processing.
++.NOTPARALLEL:
++.NO_PARALLEL:
+ SUBDIRS = include unix nls @ISC_THREAD_DIR@
+ TARGETS = timestamp
+
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index eacb23f..8431eb9 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -19,6 +19,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://init.d-add-support-for-read-only-rootfs.patch \
file://bind9_9_5-CVE-2014-8500.patch \
file://bind-add-crosscripts-search-path-for-xml2-config.patch \
+ file://bind-subdirs-run-serially.patch \
"
SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
@@ -48,7 +49,6 @@ INITSCRIPT_PARAMS = "defaults"
SYSTEMD_SERVICE_${PN} = "named.service"
-PARALLEL_MAKE = ""
RDEPENDS_${PN} = "python-core"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 02/12] tcp-wrappers: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
2015-02-13 8:15 ` [PATCH 01/12] bind: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 03/12] slang: " Robert Yang
` (9 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../tcp-wrappers-7.6/makefile-fix-parallel.patch | 54 ++++++++++++++++++++
.../tcp-wrappers/tcp-wrappers_7.6.bb | 6 +--
2 files changed, 57 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
new file mode 100644
index 0000000..7973525
--- /dev/null
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
@@ -0,0 +1,54 @@
+From daf89d272e51b2153015ce7f54ab0b86182e64c1 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 28 Jan 2015 18:50:23 -0800
+Subject: [PATCH] Makefile: fix for parallel build
+
+Fixed:
+make: *** No rule to make target `cflags', needed by `tcpd.o'. Stop.
+
+Let "cflags" depend on config-check which generates cflgas will fix the
+problem.
+
+Also fixed:
+Fatal error: can't create shared/hosts_access.o: No such file or directory
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fe5e732..f468751 100644
+--- a/Makefile
++++ b/Makefile
+@@ -714,6 +714,7 @@ KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
+ LIB = libwrap.a
+
+ shared/%.o: %.c
++ [ -d shared ] || mkdir -p shared
+ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
+
+ SOMAJOR = 0
+@@ -730,6 +731,8 @@ SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
+
+ all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
+
++cflags: config-check
++
+ # Invalidate all object files when the compiler options (CFLAGS) have changed.
+
+ config-check:
+@@ -739,7 +742,7 @@ config-check:
+ then rm cflags.new ; \
+ else mv cflags.new cflags ; \
+ fi >/dev/null 2>/dev/null
+- @if [ ! -d shared ]; then mkdir shared; fi
++ @[ -d shared ] || mkdir -p shared
+
+ $(LIB): $(LIB_OBJ)
+ rm -f $(LIB)
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 4d64306..2630478 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -40,16 +40,16 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
file://tcpdchk_libwrapped.patch \
file://ldflags.patch \
file://rename_strings_variable.patch \
- \
file://try-from.8 \
- file://safe_finger.8"
+ file://safe_finger.8 \
+ file://makefile-fix-parallel.patch \
+ "
SRC_URI[md5sum] = "e6fa25f71226d090f34de3f6b122fb5a"
SRC_URI[sha256sum] = "9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d"
S = "${WORKDIR}/tcp_wrappers_${PV}"
-PARALLEL_MAKE = ""
EXTRA_OEMAKE = "'CC=${CC}' \
'AR=${AR}' \
'RANLIB=${RANLIB}' \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 03/12] slang: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
2015-02-13 8:15 ` [PATCH 01/12] bind: " Robert Yang
2015-02-13 8:15 ` [PATCH 02/12] tcp-wrappers: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-15 22:02 ` Richard Purdie
2015-02-13 8:15 ` [PATCH 04/12] at: " Robert Yang
` (8 subsequent siblings)
11 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../slang/slang/slang-makefile-fix-parallel.patch | 177 ++++++++++++++++++++
meta/recipes-extended/slang/slang_2.2.4.bb | 2 +-
2 files changed, 178 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/slang/slang/slang-makefile-fix-parallel.patch
diff --git a/meta/recipes-extended/slang/slang/slang-makefile-fix-parallel.patch b/meta/recipes-extended/slang/slang/slang-makefile-fix-parallel.patch
new file mode 100644
index 0000000..3524061
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/slang-makefile-fix-parallel.patch
@@ -0,0 +1,177 @@
+From ba11ed50474cf00d38ad96f600e4f5fc0d42d924 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 28 Jan 2015 22:55:17 -0800
+Subject: [PATCH] Makefile.in: fix for parallel build
+
+Fixed:
+* /bin/sh: 1: cd: can't cd to objs
+
+The $(OBJDIR) was in wrong place.
+
+* install: cannot stat `src/elfobjs/libslang.so.2.2.4': No such file or directory
+
+* install: target `/usr/share/slsh/rline/' is not a directory: No such file or directory
+
+Upstream-Status: Pending
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ modules/Makefile.in | 64 +++++++++++++++++++++++++--------------------------
+ slsh/Makefile.in | 10 ++++----
+ src/Makefile.in | 2 +-
+ 3 files changed, 38 insertions(+), 38 deletions(-)
+
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 0384359..bd9e9a6 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -87,53 +87,53 @@ config.h: ../src/config.h
+ $(OBJDIR):
+ -$(MKINSDIR) $(OBJDIR)
+ #
+-slsmg-module.so: $(OBJDIR) $(OBJDIR)/slsmg-module.so
+-$(OBJDIR)/slsmg-module.so: slsmg-module.c config.h
++slsmg-module.so: $(OBJDIR)/slsmg-module.so
++$(OBJDIR)/slsmg-module.so: slsmg-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/slsmg-module.c -o slsmg-module.so $(LIBS)
+-rand-module.so: $(OBJDIR) $(OBJDIR)/rand-module.so
+-$(OBJDIR)/rand-module.so: rand-module.c config.h
++rand-module.so: $(OBJDIR)/rand-module.so
++$(OBJDIR)/rand-module.so: rand-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/rand-module.c -o rand-module.so $(LIBS)
+-newt-module.so: $(OBJDIR) $(OBJDIR)/newt-module.so
+-$(OBJDIR)/newt-module.so: newt-module.c config.h
++newt-module.so: $(OBJDIR)/newt-module.so
++$(OBJDIR)/newt-module.so: newt-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/newt-module.c -o newt-module.so -lnewt $(LIBS)
+-termios-module.so: $(OBJDIR) $(OBJDIR)/termios-module.so
+-$(OBJDIR)/termios-module.so: termios-module.c config.h
++termios-module.so: $(OBJDIR)/termios-module.so
++$(OBJDIR)/termios-module.so: termios-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/termios-module.c -o termios-module.so $(LIBS)
+-select-module.so: $(OBJDIR) $(OBJDIR)/select-module.so
+-$(OBJDIR)/select-module.so: select-module.c config.h
++select-module.so: $(OBJDIR)/select-module.so
++$(OBJDIR)/select-module.so: select-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/select-module.c -o select-module.so $(LIBS)
+-fcntl-module.so: $(OBJDIR) $(OBJDIR)/fcntl-module.so
+-$(OBJDIR)/fcntl-module.so: fcntl-module.c config.h
++fcntl-module.so: $(OBJDIR)/fcntl-module.so
++$(OBJDIR)/fcntl-module.so: fcntl-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/fcntl-module.c -o fcntl-module.so $(LIBS)
+-varray-module.so: $(OBJDIR) $(OBJDIR)/varray-module.so
+-$(OBJDIR)/varray-module.so: varray-module.c config.h
++varray-module.so: $(OBJDIR)/varray-module.so
++$(OBJDIR)/varray-module.so: varray-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/varray-module.c -o varray-module.so $(LIBS)
+-pcre-module.so: $(OBJDIR) $(OBJDIR)/pcre-module.so
+-$(OBJDIR)/pcre-module.so: pcre-module.c config.h
++pcre-module.so: $(OBJDIR)/pcre-module.so
++$(OBJDIR)/pcre-module.so: pcre-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(PCRE_INC) $(SRCDIR)/pcre-module.c -o pcre-module.so $(PCRE_LIB) $(LIBS)
+-onig-module.so: $(OBJDIR) $(OBJDIR)/onig-module.so
+-$(OBJDIR)/onig-module.so: onig-module.c config.h
++onig-module.so: $(OBJDIR)/onig-module.so
++$(OBJDIR)/onig-module.so: onig-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(ONIG_INC) $(SRCDIR)/onig-module.c -o onig-module.so $(ONIG_LIB) $(LIBS)
+-png-module.so: $(OBJDIR) $(OBJDIR)/png-module.so
+-$(OBJDIR)/png-module.so: png-module.c config.h
++png-module.so: $(OBJDIR)/png-module.so
++$(OBJDIR)/png-module.so: png-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(PNG_INC) $(SRCDIR)/png-module.c -o png-module.so $(PNG_LIB) $(LIBS)
+-socket-module.so: $(OBJDIR) $(OBJDIR)/socket-module.so
+-$(OBJDIR)/socket-module.so: socket-module.c config.h
++socket-module.so: $(OBJDIR)/socket-module.so
++$(OBJDIR)/socket-module.so: socket-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/socket-module.c -o socket-module.so $(SOCKET_LIBS) $(LIBS)
+-iconv-module.so: $(OBJDIR) $(OBJDIR)/iconv-module.so
+-$(OBJDIR)/iconv-module.so: iconv-module.c config.h
++iconv-module.so: $(OBJDIR)/iconv-module.so
++$(OBJDIR)/iconv-module.so: iconv-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(ICONV_INC) $(SRCDIR)/iconv-module.c -o iconv-module.so $(ICONV_LIB) $(LIBS)
+-zlib-module.so: $(OBJDIR) $(OBJDIR)/zlib-module.so
+-$(OBJDIR)/zlib-module.so: zlib-module.c config.h
++zlib-module.so: $(OBJDIR)/zlib-module.so
++$(OBJDIR)/zlib-module.so: zlib-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(ZLIB_INC) $(SRCDIR)/zlib-module.c -o zlib-module.so $(ZLIB_LIB) $(LIBS)
+-fork-module.so: $(OBJDIR) $(OBJDIR)/fork-module.so
+-$(OBJDIR)/fork-module.so: fork-module.c config.h
++fork-module.so: $(OBJDIR)/fork-module.so
++$(OBJDIR)/fork-module.so: fork-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/fork-module.c -o fork-module.so $(LIBS)
+-sysconf-module.so: $(OBJDIR) $(OBJDIR)/sysconf-module.so
+-$(OBJDIR)/sysconf-module.so: sysconf-module.c config.h
++sysconf-module.so: $(OBJDIR)/sysconf-module.so
++$(OBJDIR)/sysconf-module.so: sysconf-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/sysconf-module.c -o sysconf-module.so $(LIBS)
+-csv-module.so: $(OBJDIR) $(OBJDIR)/csv-module.so
+-$(OBJDIR)/csv-module.so: csv-module.c config.h
++csv-module.so: $(OBJDIR)/csv-module.so
++$(OBJDIR)/csv-module.so: csv-module.c config.h $(OBJDIR)
+ cd $(OBJDIR) && $(CC_SHARED) $(INCS) $(SRCDIR)/csv-module.c -o csv-module.so $(LIBS)
+
+ # Note that Windows/Cygwin modules need execute permissions
+diff --git a/slsh/Makefile.in b/slsh/Makefile.in
+index b71b9bc..0b0271c 100644
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -99,7 +99,7 @@ install_directories:
+ $(MKINSDIR) $(DEST_SLSH_LOCALLIB_DIR)
+ $(MKINSDIR) $(DEST_SLSH_SCRIPT_DIR)
+ $(MKINSDIR) $(DEST_SLSH_DOC_DIR)/html
+-install_lib_files:
++install_lib_files: install_directories
+ @for X in lib/*.sl; \
+ do \
+ echo $(INSTALL_DATA) $$X $(DEST_SLSH_LIB_DIR); \
+@@ -108,7 +108,7 @@ install_lib_files:
+ exit 1; \
+ fi; \
+ done
+-install_rline_files:
++install_rline_files: install_directories
+ @for X in lib/rline/*.sl lib/rline/slrline.rc; \
+ do \
+ echo $(INSTALL_DATA) $$X $(DEST_SLSH_LIB_DIR)/rline/; \
+@@ -117,7 +117,7 @@ install_rline_files:
+ exit 1; \
+ fi; \
+ done
+-install_scripts:
++install_scripts: install_directories
+ @for X in $(SCRIPTS); \
+ do \
+ echo $(INSTALL) scripts/$$X $(DEST_SLSH_SCRIPT_DIR); \
+@@ -126,7 +126,7 @@ install_scripts:
+ exit 1; \
+ fi; \
+ done
+-install_help:
++install_help: install_directories
+ @for X in lib/help/*.hlp; \
+ do \
+ echo $(INSTALL_DATA) $$X $(DEST_SLSH_HELP_DIR); \
+@@ -135,7 +135,7 @@ install_help:
+ exit 1; \
+ fi; \
+ done
+-install_docs:
++install_docs: install_directories
+ @for X in doc/html/*.html; \
+ do \
+ echo $(INSTALL_DATA) $$X $(DEST_SLSH_DOC_DIR)/html/; \
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 03fa056..2c6cdbf 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -191,7 +191,7 @@ install-static: static install-headers install-docs $(DEST_LIBDIR)
+ @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)/
+ $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
+ $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
+-install-elf-and-links:
++install-elf-and-links: $(ELFDIR_ELF_LIB)
+ -$(RM) $(DEST_LIBDIR)/$(ELFLIB)
+ -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
+ @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index ed1190a..aca3593 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -22,6 +22,7 @@ SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
file://change-char-type-to-signed-char-in-macros.patch \
file://sprintf-bug-concerning-8-bit-characters.patch \
file://slang-fix-the-iconv-existence-checking.patch \
+ file://slang-makefile-fix-parallel.patch \
"
inherit autotools-brokensep
@@ -48,4 +49,3 @@ do_install() {
FILES_${PN} += "${libdir}/${BPN}/v2/modules/ ${datadir}/slsh/"
FILES_${PN}-dbg += "${libdir}/${BPN}/v2/modules/.debug"
-PARALLEL_MAKE = ""
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 04/12] at: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (2 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 03/12] slang: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 05/12] mtools: " Robert Yang
` (7 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../at/at/makefile-fix-parallel.patch | 35 ++++++++++++++++++++
meta/recipes-extended/at/at_3.1.16.bb | 5 +--
2 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/at/at/makefile-fix-parallel.patch
diff --git a/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
new file mode 100644
index 0000000..932a4c0
--- /dev/null
+++ b/meta/recipes-extended/at/at/makefile-fix-parallel.patch
@@ -0,0 +1,35 @@
+From 150b63a936af71b992a3a7b0fc2d2497e51fc800 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 28 Jan 2015 23:52:00 -0800
+Subject: [PATCH] Makefile: fix for parallel build
+
+Fixed:
+y.tab.c:1001:0: error: unterminated #if
+
+Let "$(YACC) -d parsetime.y" only run once will fix the problem.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2a9b918..aa7c04a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -75,7 +75,9 @@ at: $(ATOBJECTS)
+ atd: $(RUNOBJECTS)
+ $(CC) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)
+
+-y.tab.c y.tab.h: parsetime.y
++y.tab.h: y.tab.c
++
++y.tab.c: parsetime.y
+ $(YACC) -d parsetime.y
+
+ lex.yy.c: parsetime.l
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/at/at_3.1.16.bb b/meta/recipes-extended/at/at_3.1.16.bb
index f16edba..cee9fde 100644
--- a/meta/recipes-extended/at/at_3.1.16.bb
+++ b/meta/recipes-extended/at/at_3.1.16.bb
@@ -22,7 +22,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://file_replacement_with_gplv2.patch \
file://atd.init \
file://atd.service \
- ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
+ file://makefile-fix-parallel.patch \
+ "
PAM_SRC_URI = "file://pam.conf.patch \
file://configure-add-enable-pam.patch"
@@ -44,7 +46,6 @@ INITSCRIPT_PARAMS = "defaults"
SYSTEMD_SERVICE_${PN} = "atd.service"
-PARALLEL_MAKE = ""
do_compile_prepend () {
cp -f ${WORKDIR}/posixtm.[ch] ${S}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 05/12] mtools: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (3 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 04/12] at: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 06/12] pth: " Robert Yang
` (6 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Fixed do_install error:
mkdir: cannot create directory `/path/to/image/usr': File exists
mkdir: cannot create directory `/path/to/image/usr/share': File exists
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/mtools/mtools_3.9.9.bb | 8 ++++++--
meta/recipes-devtools/mtools/mtools_4.0.18.bb | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index f6dd336..9cd1c57 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -44,6 +44,10 @@ inherit autotools texinfo
EXTRA_OECONF = "--without-x"
-PARALLEL_MAKEINST = ""
-
BBCLASSEXTEND = "native nativesdk"
+
+do_install_prepend () {
+ # Create bindir to fix parallel installation issues
+ mkdir -p ${D}/${bindir}
+ mkdir -p ${D}/${datadir}
+}
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
index 6c71f0a..b2cfe9a 100644
--- a/meta/recipes-devtools/mtools/mtools_4.0.18.bb
+++ b/meta/recipes-devtools/mtools/mtools_4.0.18.bb
@@ -35,6 +35,10 @@ inherit autotools texinfo
EXTRA_OECONF = "--without-x"
-PARALLEL_MAKEINST = ""
-
BBCLASSEXTEND = "native nativesdk"
+
+do_install_prepend () {
+ # Create bindir to fix parallel installation issues
+ mkdir -p ${D}/${bindir}
+ mkdir -p ${D}/${datadir}
+}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 06/12] pth: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (4 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 05/12] mtools: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 07/12] openssl: " Robert Yang
` (5 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../pth/files/pth-fix-parallel.patch | 48 ++++++++++++++++++++
meta/recipes-support/pth/pth_2.0.7.bb | 6 +--
2 files changed, 51 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-support/pth/files/pth-fix-parallel.patch
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 0000000..08edaff
--- /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 416e788..9037769 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 07/12] openssl: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (5 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 06/12] pth: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 08/12] blktrace: " Robert Yang
` (4 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Fixed:
Cannot create directory image/usr: File exists
make: *** [install_sw] Error 17
Create /usr to avoid race issues.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 3 +++
.../recipes-connectivity/openssl/openssl_1.0.1j.bb | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 31dfd8f..439c475 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -152,6 +152,9 @@ do_compile_ptest () {
}
do_install () {
+ # Create ${D}/${prefix} to fix parallel issues
+ mkdir -p ${D}/${prefix}/
+
oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install
oe_libinstall -so libcrypto ${D}${libdir}
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
index 2da18ae..2bca400 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb
@@ -49,9 +49,6 @@ PACKAGES =+ " \
FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
-PARALLEL_MAKE = ""
-PARALLEL_MAKEINST = ""
-
do_configure_prepend() {
cp ${WORKDIR}/find.pl ${S}/util/find.pl
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 08/12] blktrace: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (6 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 07/12] openssl: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 09/12] ghostscript: " Robert Yang
` (3 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../blktrace/blktrace/makefile-fix-parallel.patch | 41 ++++++++++++++++++++
meta/recipes-kernel/blktrace/blktrace_git.bb | 5 ++-
2 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
diff --git a/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
new file mode 100644
index 0000000..df08770
--- /dev/null
+++ b/meta/recipes-kernel/blktrace/blktrace/makefile-fix-parallel.patch
@@ -0,0 +1,41 @@
+From 98cb9a95ce536d21be390934bd42dc2abde5959f Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 29 Jan 2015 22:18:06 -0800
+Subject: [PATCH] Makefile: fix for parallel build
+
+Fixed parallel issue:
+* btreplay.o: file not recognized: File truncated
+ collect2: error: ld returned 1 exit status
+
+* btreplay/btreplay.c:47:18: fatal error: list.h: No such file or directory
+ #include "list.h"
+ ^
+ compilation terminated.
+
+ Don't make btreplay twice will fix the problem
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fe35d02..e7b1e94 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,8 +17,8 @@ btt/btt:
+ btreplay/btrecord:
+ $(MAKE) -C btreplay
+
+-btreplay/btreplay:
+- $(MAKE) -C btreplay
++btreplay/btreplay: btreplay/btrecord
++ echo Building $@
+
+ %.o: %.c
+ $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+--
+1.7.9.5
+
diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index 7a32993..29186fc 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -10,7 +10,9 @@ PR = "r6"
PV = "1.0.5+git${SRCPV}"
SRC_URI = "git://git.kernel.dk/blktrace.git \
- file://ldflags.patch"
+ file://ldflags.patch \
+ file://makefile-fix-parallel.patch \
+ "
S = "${WORKDIR}/git"
@@ -19,7 +21,6 @@ EXTRA_OEMAKE = "\
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
-PARALLEL_MAKE = ""
do_install() {
oe_runmake ARCH="${ARCH}" prefix=${prefix} \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 09/12] ghostscript: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (7 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 08/12] blktrace: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 10/12] pcmciautils: " Robert Yang
` (2 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../ghostscript-9.15-parallel-make.patch | 40 ++++++++++++++++++++
.../ghostscript/ghostscript_9.15.bb | 6 +--
2 files changed, 41 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
new file mode 100644
index 0000000..797b894
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
@@ -0,0 +1,40 @@
+From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Fri, 30 Jan 2015 00:40:22 -0800
+Subject: [PATCH] contrib.mak: fix for parallel build
+
+Fixed:
+rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory
+
+Create lib before install to fix the race issue.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ contrib/contrib.mak | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/contrib/contrib.mak b/contrib/contrib.mak
+index 08a80d1..de2e20d 100644
+--- a/contrib/contrib.mak
++++ b/contrib/contrib.mak
+@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
+ $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
+
+ extra-dmprt-install:
++ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
+ $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
+ $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
+ $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
+@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH)
+ ### ----------------- Additional .upp files ---------------- ###
+
+ extra-upp-install:
++ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
+ for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
+ $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
+ done
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
index 850ed81..5788837 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.15.bb
@@ -24,6 +24,7 @@ SRC_URI = "${SRC_URI_BASE} \
file://objarch.h \
file://ghostscript-9.02-parallel-make.patch \
file://cups-no-gcrypt.patch \
+ file://ghostscript-9.15-parallel-make.patch \
"
SRC_URI_class-native = "${SRC_URI_BASE} \
@@ -101,8 +102,3 @@ do_install_class-native () {
}
BBCLASSEXTEND = "native"
-
-# Ghostscript install tool 'instcopy' tries to remove already created
-# directories during install and parallel make causes problems.
-PARALLEL_MAKEINST=""
-
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 10/12] pcmciautils: fix and enable parallel build
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (8 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 09/12] ghostscript: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 11/12] vala.bbclass: enable PARALLEL_MAKE Robert Yang
2015-02-13 8:15 ` [PATCH 12/12] meta: enable parallel build for several recipes Robert Yang
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../Makefile-fix-for-parallel-build.patch | 35 ++++++++++++++++++++
meta/recipes-bsp/pcmciautils/pcmciautils.inc | 1 -
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 4 ++-
3 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
new file mode 100644
index 0000000..e9eaab7
--- /dev/null
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch
@@ -0,0 +1,35 @@
+From 1b8ad348f8c712c8e0c16c49cc1c8e577e4d6d3e Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 5 Feb 2015 01:16:30 -0800
+Subject: [PATCH] Makefile: fix for parallel build
+
+Fixed:
+| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory
+|
+| #include "yacc_config.h"
+| ^
+| compilation terminated.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d45fdc3..de2a5f9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -246,7 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config
+ $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(QUIET) $(STRIPCMD) $@
+
+-yacc_config.o lex_config.o: %.o: %.c
++yacc_config.o lex_config.o: %.o: %.c: %.h
+ $(CC) -c -MD -O -pipe $(CPPFLAGS) $<
+
+ debugtools: ccdv $(CBDUMP) $(CISDUMP)
+--
+1.7.9.5
+
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index 04056e3..9d1c55b 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -23,7 +23,6 @@ LD = "${CC}"
CFLAGS =+ "-I${S}/src"
CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\""
-PARALLEL_MAKE = ""
EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'"
do_install () {
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 50629b4..fc76c44 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -1,6 +1,8 @@
require pcmciautils.inc
-SRC_URI += "file://makefile_fix.patch"
+SRC_URI += "file://makefile_fix.patch \
+ file://Makefile-fix-for-parallel-build.patch \
+"
SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4"
SRC_URI[sha256sum] = "79e6ae441278e178c07501d492394ed2c0326fdb66894f6d040ec811b0dc8ed5"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 11/12] vala.bbclass: enable PARALLEL_MAKE
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (9 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 10/12] pcmciautils: " Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
2015-02-13 8:15 ` [PATCH 12/12] meta: enable parallel build for several recipes Robert Yang
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
The midori is built well now.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/vala.bbclass | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/classes/vala.bbclass b/meta/classes/vala.bbclass
index 0b7803b..9ff664a 100644
--- a/meta/classes/vala.bbclass
+++ b/meta/classes/vala.bbclass
@@ -1,6 +1,3 @@
-# Vala has problems with multiple concurrent invocations
-PARALLEL_MAKE = ""
-
# Everyone needs vala-native and targets need vala, too,
# because that is where target builds look for .vapi files.
#
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 12/12] meta: enable parallel build for several recipes
2015-02-13 8:15 [PATCH 00/12] meta: fix and enable parallel build Robert Yang
` (10 preceding siblings ...)
2015-02-13 8:15 ` [PATCH 11/12] vala.bbclass: enable PARALLEL_MAKE Robert Yang
@ 2015-02-13 8:15 ` Robert Yang
11 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2015-02-13 8:15 UTC (permalink / raw)
To: openembedded-core
I used a for loop to build these packages more than 520 times, these
recipes never failed.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../nfs-utils/nfs-utils_1.3.1.bb | 2 --
meta/recipes-core/libcgroup/libcgroup_0.41.bb | 3 ---
meta/recipes-devtools/autoconf/autoconf_2.69.bb | 2 --
meta/recipes-devtools/dpkg/dpkg.inc | 2 --
meta/recipes-devtools/json-c/json-c_0.12.bb | 2 --
meta/recipes-devtools/mtd/mtd-utils_git.bb | 2 --
.../python/python-pygobject_2.28.3.bb | 2 --
meta/recipes-devtools/valgrind/valgrind_3.10.1.bb | 1 -
meta/recipes-extended/bash/bash.inc | 2 --
meta/recipes-extended/mailx/mailx_12.5.bb | 1 -
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 --
meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb | 2 --
.../xorg-lib/libpthread-stubs_0.3.bb | 1 -
meta/recipes-graphics/xorg-lib/xcb-util.inc | 2 --
meta/recipes-kernel/perf/perf.bb | 1 -
meta/recipes-multimedia/speex/speex_1.2rc1.bb | 2 --
meta/recipes-support/icu/icu.inc | 1 -
meta/recipes-support/libpcre/libpcre_8.36.bb | 2 --
18 files changed, 32 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index d312349..e4655d9 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
@@ -34,8 +34,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8"
SRC_URI[sha256sum] = "ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8"
-PARALLEL_MAKE = ""
-
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 69f8566..52ba1d76 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
@@ -17,9 +17,6 @@ SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706
EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
-# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html
-PARALLEL_MAKE = ""
-
PACKAGES =+ "cgroups-pam-plugin"
FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*"
FILES_${PN}-dbg += "${base_libdir}/security/.debug"
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 41a17d2..809007f 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -2,8 +2,6 @@ require autoconf.inc
PR = "r11"
-PARALLEL_MAKE = ""
-
LICENSE = "GPLv2 & GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504"
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 5515666..eb47dad 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -11,8 +11,6 @@ RDEPENDS_${PN}_class-native = "xz-native"
S = "${WORKDIR}/${BPN}-${PV}"
-PARALLEL_MAKE = ""
-
inherit autotools gettext perlnative pkgconfig systemd
python () {
diff --git a/meta/recipes-devtools/json-c/json-c_0.12.bb b/meta/recipes-devtools/json-c/json-c_0.12.bb
index 79cf6dc..e9c5b31 100644
--- a/meta/recipes-devtools/json-c/json-c_0.12.bb
+++ b/meta/recipes-devtools/json-c/json-c_0.12.bb
@@ -11,8 +11,6 @@ SRC_URI[sha256sum] = "000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c1707
RPROVIDES_${PN} = "libjson"
-PARALLEL_MAKE = ""
-
inherit autotools
do_configure_prepend() {
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 52297c6..267d1e9 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -29,6 +29,4 @@ FILES_mtd-utils-jffs2 = "${sbindir}/mkfs.jffs2 ${sbindir}/jffs2dump ${sbindir}/j
FILES_mtd-utils-ubifs = "${sbindir}/mkfs.ubifs ${sbindir}/ubi*"
FILES_mtd-utils-misc = "${sbindir}/nftl* ${sbindir}/ftl* ${sbindir}/rfd* ${sbindir}/doc* ${sbindir}/serve_image ${sbindir}/recv_image"
-PARALLEL_MAKE = ""
-
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 45a0603..e7f17ff 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -18,8 +18,6 @@ S = "${WORKDIR}/pygobject-${PV}"
EXTRA_OECONF += "--disable-introspection"
-PARALLEL_MAKEINST = ""
-
inherit autotools distutils-base pkgconfig
# necessary to let the call for python-config succeed
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
index 543c8a6..7d02b9f 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
@@ -36,7 +36,6 @@ inherit autotools ptest
EXTRA_OECONF = "--enable-tls --without-mpicc"
EXTRA_OECONF_armv7a = "--enable-tls -host=armv7-none-linux-gnueabi --without-mpicc"
EXTRA_OEMAKE = "-w"
-PARALLEL_MAKE = ""
do_install_append () {
install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 0fd5af9..d7b28cf 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -6,8 +6,6 @@ DEPENDS = "ncurses bison-native"
inherit autotools gettext texinfo update-alternatives ptest
-PARALLEL_MAKE = ""
-
EXTRA_AUTORECONF += "--exclude=autoheader"
EXTRA_OECONF = "--enable-job-control"
diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb
index cc0b6bf..f2899d5 100644
--- a/meta/recipes-extended/mailx/mailx_12.5.bb
+++ b/meta/recipes-extended/mailx/mailx_12.5.bb
@@ -29,4 +29,3 @@ inherit autotools-brokensep
CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT"
EXTRA_OEMAKE = "SENDMAIL=${sbindir}/sendmail"
-PARALLEL_MAKE = ""
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index e544b60..266bd42 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -53,8 +53,6 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
-PARALLEL_MAKE = ""
-
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
do_configure_prepend() {
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
index 38304a9..197f962 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb
@@ -42,8 +42,6 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
-PARALLEL_MAKE = ""
-
EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
do_configure_prepend() {
diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
index 3e7ef27..5514c7f 100644
--- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb
@@ -7,7 +7,6 @@ SECTION = "x11/libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad"
-PARALLEL_MAKE = ""
#DEPENDS = "xcb-proto xproto libxau libxslt-native"
# DEPENDS += "xsltproc-native gperf-native"
diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc
index 7dad545..d15cf9f 100644
--- a/meta/recipes-graphics/xorg-lib/xcb-util.inc
+++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc
@@ -16,8 +16,6 @@ SECTION = "x11/libs"
DEPENDS = "libxcb"
DEPENDS += "gperf-native"
-PARALLEL_MAKE = ""
-
SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2"
inherit autotools pkgconfig
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index fcfd0ad..f69d177 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -98,7 +98,6 @@ EXTRA_OEMAKE += "\
'infodir=${@os.path.relpath(infodir, prefix)}' \
"
-PARALLEL_MAKE = ""
do_compile() {
# Linux kernel build system is expected to do the right thing
diff --git a/meta/recipes-multimedia/speex/speex_1.2rc1.bb b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
index 9fd88a3..5ff50b7 100644
--- a/meta/recipes-multimedia/speex/speex_1.2rc1.bb
+++ b/meta/recipes-multimedia/speex/speex_1.2rc1.bb
@@ -14,8 +14,6 @@ SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
SRC_URI[md5sum] = "c4438b22c08e5811ff10e2b06ee9b9ae"
SRC_URI[sha256sum] = "342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6"
-PARALLEL_MAKE = ""
-
inherit autotools pkgconfig lib_package
EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 26994bb..f192b95 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -10,7 +10,6 @@ S = "${WORKDIR}/icu/source"
SPDX_S = "${WORKDIR}/icu"
STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
-PARALLEL_MAKE = ""
CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
BINCONFIG = "${bindir}/icu-config"
diff --git a/meta/recipes-support/libpcre/libpcre_8.36.bb b/meta/recipes-support/libpcre/libpcre_8.36.bb
index 6aa0237..a4b7f6d 100644
--- a/meta/recipes-support/libpcre/libpcre_8.36.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.36.bb
@@ -28,8 +28,6 @@ BINCONFIG = "${bindir}/pcre-config"
inherit autotools binconfig-disabled ptest
-PARALLEL_MAKE = ""
-
EXTRA_OECONF = "\
--enable-newline-is-lf \
--enable-rebuild-chartables \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread