mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
7fc8172e3d
CRDA has been relicensed under the copyleft-next license. Regulatory bins license remains ISC. There is an new internal library called libreg.so which was placed in the same directory of the regulatory bin. The call to make was adjusted accordingly. Remove version 1.1.3. Signed-off-by: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sat, 23 Aug 2014 12:26:37 -0700
|
|
Subject: 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.
|
|
|
|
Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html]
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda
|
|
CFLAGS += -Wall -g
|
|
LDLIBREG += -lreg
|
|
LDLIBS += $(LDLIBREG)
|
|
-LDLIBS += -lm
|
|
+LIBREGLDLIBS += -lm
|
|
LIBREG += libreg.so
|
|
LDFLAGS += -L ./
|
|
|
|
@@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r
|
|
|
|
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
|
|
|
|
else
|
|
CFLAGS += -DUSE_GCRYPT
|
|
-LDLIBS += -lgcrypt
|
|
+LIBREGLDLIBS += -lgcrypt
|
|
|
|
$(LIBREG): keys-gcrypt.c
|
|
|
|
@@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(
|
|
|
|
$(LIBREG): regdb.h reglib.h reglib.c
|
|
$(NQ) ' CC ' $@
|
|
- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
|
|
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS)
|
|
|
|
install-libreg-headers:
|
|
$(NQ) ' INSTALL libreg-headers'
|