diff --git a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch index aceb56df74a..812e983798e 100644 --- a/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch +++ b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch @@ -1,6 +1,7 @@ +From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 23 Aug 2014 12:26:37 -0700 -Subject: Fix linking of libraries used by libreg +Subject: [PATCH] Fix linking of libraries used by libreg The math and crypto libraries are called by and need to be linked to libreg.so, not to the executables. @@ -9,10 +10,15 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027 Signed-off-by: Ben Hutchings Signed-off-by: Joe MacDonald +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/Makefile b/Makefile +index a3ead30..da2dcc3 100644 --- a/Makefile +++ b/Makefile -@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda +@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic CFLAGS += -Wall -g LDLIBREG += -lreg LDLIBS += $(LDLIBREG) @@ -21,16 +27,14 @@ Signed-off-by: Joe MacDonald LIBREG += libreg.so LDFLAGS += -L ./ -@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r +@@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize ifeq ($(USE_OPENSSL),1) CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` -LDLIBS += `pkg-config --libs openssl` +LIBREGLDLIBS += `pkg-config --libs openssl` - ifeq ($(RUNTIME_PUBKEY_ONLY),1) - CFLAGS += -DRUNTIME_PUBKEY_ONLY -@@ -51,7 +51,7 @@ endif + $(LIBREG): keys-ssl.c else CFLAGS += -DUSE_GCRYPT @@ -39,7 +43,7 @@ Signed-off-by: Joe MacDonald $(LIBREG): keys-gcrypt.c -@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( +@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $(LIBREG): regdb.h reglib.h reglib.c $(NQ) ' CC ' $@ @@ -48,3 +52,6 @@ Signed-off-by: Joe MacDonald install-libreg-headers: $(NQ) ' INSTALL libreg-headers' +-- +2.7.4 +