Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 890f5bf2654b695a866262d72bfa9750af921a3b Mon Sep 17 00:00:00 2001 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 2 | From: Ben Hutchings <ben@decadent.org.uk> |
| 3 | Date: Sat, 23 Aug 2014 12:26:37 -0700 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 4 | Subject: [PATCH] Fix linking of libraries used by libreg |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 5 | |
| 6 | The math and crypto libraries are called by and need to be linked to |
| 7 | libreg.so, not to the executables. |
| 8 | |
| 9 | Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126027.html] |
| 10 | |
| 11 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| 12 | Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 13 | --- |
| 14 | Makefile | 8 ++++---- |
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 16 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 17 | diff --git a/Makefile b/Makefile |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 18 | index 528a14e..acd818b 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 19 | --- a/Makefile |
| 20 | +++ b/Makefile |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 21 | @@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 22 | CFLAGS += -Wall -g |
| 23 | LDLIBREG += -lreg |
| 24 | LDLIBS += $(LDLIBREG) |
| 25 | -LDLIBS += -lm |
| 26 | +LIBREGLDLIBS += -lm |
| 27 | LIBREG += libreg.so |
| 28 | LDFLAGS += -L ./ |
| 29 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 30 | @@ -40,13 +40,13 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 31 | |
| 32 | ifeq ($(USE_OPENSSL),1) |
| 33 | CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` |
| 34 | -LDLIBS += `pkg-config --libs openssl` |
| 35 | +LIBREGLDLIBS += `pkg-config --libs openssl` |
| 36 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 37 | $(LIBREG): keys-ssl.c |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | |
| 39 | else |
| 40 | CFLAGS += -DUSE_GCRYPT |
| 41 | -LDLIBS += -lgcrypt |
| 42 | +LIBREGLDLIBS += -lgcrypt |
| 43 | |
| 44 | $(LIBREG): keys-gcrypt.c |
| 45 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 46 | @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 47 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 48 | $(LIBREG): reglib.c regdb.h reglib.h |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 49 | $(NQ) ' CC ' $@ |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame] | 50 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< |
| 51 | + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 52 | |
| 53 | install-libreg-headers: |
| 54 | $(NQ) ' INSTALL libreg-headers' |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 55 | -- |
| 56 | 2.7.4 |
| 57 | |