From 6d700823b526d7545ac880574df0aa33bfc30d70 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 15 Nov 2016 05:01:51 +0000 Subject: crda: Fix build with clang Signed-off-by: Khem Raj Signed-off-by: Joe MacDonald --- .../recipes-connectivity/crda/crda/make.patch | 25 ++++++++++++++++++++++ .../recipes-connectivity/crda/crda_3.18.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-networking/recipes-connectivity/crda/crda/make.patch diff --git a/meta-networking/recipes-connectivity/crda/crda/make.patch b/meta-networking/recipes-connectivity/crda/crda/make.patch new file mode 100644 index 0000000000..0b737852c2 --- /dev/null +++ b/meta-networking/recipes-connectivity/crda/crda/make.patch @@ -0,0 +1,25 @@ +These headers are not related to any Make rule but they do appear in +compiling of libreg.so, specifying .h files in compiler cmdline is flagged +as error by clang + +| clang-4.0: error: cannot specify -o when generating multiple output files +| make: *** [libreg.so] Error 1 + +This is how we see headers in cmdline +-O2 -fpic -std=gnu +99 -Wall -Werror -pedantic -Wall -g -DUSE_GCRYPT -DCONFIG_LIBNL30 `pkg-config --cflags libnl-3.0` -o libreg.so -shared -Wl,-soname,libreg.so +regdb.h reglib.h reglib.c keys-gcrypt.c -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -L ./ -lm -lgcrypt + +Signed-off-by: Khem Raj + +--- a/Makefile.kk 2016-11-15 04:54:53.338670000 +0000 ++++ a/Makefile 2016-11-15 04:55:07.718670000 +0000 +@@ -114,7 +114,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( + $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) + $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ + +-$(LIBREG): regdb.h reglib.h reglib.c ++$(LIBREG): reglib.c + $(NQ) ' CC ' $@ + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) + diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 00c358dab0..4b704fe5bf 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -11,6 +11,7 @@ SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://fix-linking-of-libraries-used-by-reglib.patch \ file://fix-gcc-6-unused-variables.patch \ file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \ + file://make.patch \ " SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" -- cgit 1.2.3-korg