mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
wvstreams: Fix parallel build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 2b1e724cbb)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj
Armin Kuster
parent
a1e9dfd390
commit
a2bd363d02
|
|
@ -0,0 +1,76 @@
|
|||
From 90de630f21ac744a37b3adac1bd84654471744ff Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 24 Aug 2017 22:30:01 -0700
|
||||
Subject: [PATCH 1/2] build: fix parallel make
|
||||
|
||||
Imported from Gentoo
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Makefile | 15 +++++++++++++--
|
||||
wvrules-posix.mk | 7 +++++--
|
||||
2 files changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 72c8bef..5a4cfb2 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -131,12 +131,19 @@ utils/tests/%: PRELIBS+=$(LIBWVSTREAMS)
|
||||
# libwvstreams: stream/event handling library
|
||||
#
|
||||
TARGETS += libwvstreams.so
|
||||
-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
|
||||
+TARGETS += crypto/tests/ssltest
|
||||
+crypto/tests/ssltest: $(LIBWVSTREAMS)
|
||||
+
|
||||
+TARGETS += ipstreams/tests/unixtest
|
||||
+ipstreams/tests/unixtest: $(LIBWVSTREAMS)
|
||||
+
|
||||
TARGETS += crypto/tests/printcert
|
||||
+crypto/tests/printcert: $(LIBWVSTREAMS)
|
||||
|
||||
ifndef _MACOS
|
||||
ifneq ("$(with_readline)", "no")
|
||||
TARGETS += ipstreams/tests/wsd
|
||||
+ ipstreams/tests/wsd: $(LIBWVSTREAMS)
|
||||
ipstreams/tests/wsd-LIBS += -lreadline
|
||||
else
|
||||
TEST_SKIP_OBJS += ipstreams/tests/wsd
|
||||
@@ -179,7 +186,11 @@ uniconf/tests/%: PRELIBS+=$(LIBUNICONF)
|
||||
#
|
||||
ifneq ("$(with_dbus)", "no")
|
||||
TARGETS += libwvdbus.so
|
||||
- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
|
||||
+ TARGETS += dbus/tests/wvdbus
|
||||
+ dbus/tests/wvdbus: $(LIBWVDBUS)
|
||||
+
|
||||
+ TARGETS += dbus/tests/wvdbusd
|
||||
+ dbus/tests/wvdbusd: $(LIBWVDBUS)
|
||||
TESTS += $(call tests_cc,dbus/tests)
|
||||
libwvdbus_OBJS += $(call objects,dbus)
|
||||
libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
|
||||
diff --git a/wvrules-posix.mk b/wvrules-posix.mk
|
||||
index f94d2cd..2e99f36 100644
|
||||
--- a/wvrules-posix.mk
|
||||
+++ b/wvrules-posix.mk
|
||||
@@ -80,12 +80,15 @@ define wvlink_ar
|
||||
$(AR) s $1
|
||||
endef
|
||||
|
||||
-CC: FORCE
|
||||
+CC:
|
||||
@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
|
||||
$(WVSTREAMS)/gen-cc CC c
|
||||
|
||||
-CXX: FORCE
|
||||
+CXX:
|
||||
@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
|
||||
$(WVSTREAMS)/gen-cc CXX cc
|
||||
|
||||
+#All files must depend on the above two rules. This is a godawful hack.
|
||||
+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
|
||||
+
|
||||
wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 4afff42714a15cb796d3589d87c6fac4558b2c95 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 24 Aug 2017 22:33:32 -0700
|
||||
Subject: [PATCH 2/2] wvrules.mk: Use _DEFAULT_SOURCE
|
||||
|
||||
Fixes warnings with newer glibc
|
||||
warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
wvrules.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wvrules.mk b/wvrules.mk
|
||||
index 877f700..124bffd 100644
|
||||
--- a/wvrules.mk
|
||||
+++ b/wvrules.mk
|
||||
@@ -83,7 +83,7 @@ runtests:
|
||||
|
||||
INCFLAGS=$(addprefix -I,$(WVSTREAMS_INC) $(XPATH))
|
||||
CPPFLAGS+=$(INCFLAGS) \
|
||||
- -D_BSD_SOURCE -D_GNU_SOURCE $(OSDEFINE) \
|
||||
+ -D_DEFAULT_SOURCE $(OSDEFINE) \
|
||||
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
|
||||
-DUNSTABLE
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
|
@ -19,6 +19,8 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
|
|||
file://0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch \
|
||||
file://0004-wvcrash-Replace-use-of-basename-API.patch \
|
||||
file://0005-check-for-libexecinfo-during-configure.patch \
|
||||
file://0001-build-fix-parallel-make.patch \
|
||||
file://0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
|
||||
|
|
@ -26,8 +28,6 @@ SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8eb
|
|||
|
||||
inherit autotools-brokensep pkgconfig
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls"
|
||||
|
||||
LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user