| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From: Ben Hutchings <ben@decadent.org.uk> |
| 2 | Date: Sat, 23 Aug 2014 12:26:37 -0700 |
| 3 | Subject: Fix linking of libraries used by libreg |
| 4 | |
| 5 | The math and crypto libraries are called by and need to be linked to |
| 6 | libreg.so, not to the executables. |
| 7 | |
| 8 | Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html] |
| 9 | |
| 10 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| 11 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
| 12 | |
| 13 | --- a/Makefile |
| 14 | +++ b/Makefile |
| 15 | @@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -peda |
| 16 | CFLAGS += -Wall -g |
| 17 | LDLIBREG += -lreg |
| 18 | LDLIBS += $(LDLIBREG) |
| 19 | -LDLIBS += -lm |
| 20 | +LIBREGLDLIBS += -lm |
| 21 | LIBREG += libreg.so |
| 22 | LDFLAGS += -L ./ |
| 23 | |
| 24 | @@ -40,7 +40,7 @@ all_noverify: $(LIBREG) crda intersect r |
| 25 | |
| 26 | ifeq ($(USE_OPENSSL),1) |
| 27 | CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` |
| 28 | -LDLIBS += `pkg-config --libs openssl` |
| 29 | +LIBREGLDLIBS += `pkg-config --libs openssl` |
| 30 | |
| 31 | ifeq ($(RUNTIME_PUBKEY_ONLY),1) |
| 32 | CFLAGS += -DRUNTIME_PUBKEY_ONLY |
| 33 | @@ -51,7 +51,7 @@ endif |
| 34 | |
| 35 | else |
| 36 | CFLAGS += -DUSE_GCRYPT |
| 37 | -LDLIBS += -lgcrypt |
| 38 | +LIBREGLDLIBS += -lgcrypt |
| 39 | |
| 40 | $(LIBREG): keys-gcrypt.c |
| 41 | |
| 42 | @@ -121,7 +121,7 @@ keys-%.c: utils/key2pub.py $(wildcard $( |
| 43 | |
| 44 | $(LIBREG): regdb.h reglib.h reglib.c |
| 45 | $(NQ) ' CC ' $@ |
| 46 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ |
| 47 | + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) |
| 48 | |
| 49 | install-libreg-headers: |
| 50 | $(NQ) ' INSTALL libreg-headers' |