Contents of /trunk/crda/patches/crda-3.18-makefile-link-libreg.so-against-the-crypto-library.patch
Parent Directory | Revision Log
Revision 2753 -
(show annotations)
(download)
Thu Jan 14 16:16:34 2016 UTC (8 years, 8 months ago) by niro
File size: 1466 byte(s)
Thu Jan 14 16:16:34 2016 UTC (8 years, 8 months ago) by niro
File size: 1466 byte(s)
-added build fixes
1 | From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> |
3 | Date: Fri, 21 Feb 2014 20:15:32 +0100 |
4 | Subject: [PATCH] Makefile: Link libreg.so against the crypto library. |
5 | |
6 | --- |
7 | Makefile | 9 ++++++--- |
8 | 1 file changed, 6 insertions(+), 3 deletions(-) |
9 | |
10 | diff --git a/Makefile b/Makefile |
11 | index 1f25509..80f4946 100644 |
12 | --- a/Makefile |
13 | +++ b/Makefile |
14 | @@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) |
15 | LDLIBS += -lm |
16 | LIBREG += libreg.so |
17 | LDFLAGS += -L ./ |
18 | +LIBREG_LDFLAGS += -lm |
19 | |
20 | all: all_noverify verify |
21 | |
22 | @@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize |
23 | |
24 | ifeq ($(USE_OPENSSL),1) |
25 | CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` |
26 | -LDLIBS += `pkg-config --libs openssl` |
27 | +LDCRYPTOLIB := `pkg-config --libs openssl` |
28 | |
29 | $(LIBREG): keys-ssl.c |
30 | |
31 | else |
32 | CFLAGS += -DUSE_GCRYPT |
33 | -LDLIBS += -lgcrypt |
34 | +LDCRYPTOLIB := -lgcrypt |
35 | |
36 | $(LIBREG): keys-gcrypt.c |
37 | |
38 | endif |
39 | +LDLIBS += $(LDCRYPTOLIB) |
40 | +LIBREG_LDFLAGS += $(LDCRYPTOLIB) |
41 | MKDIR ?= mkdir -p |
42 | INSTALL ?= install |
43 | |
44 | @@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) |
45 | |
46 | $(LIBREG): regdb.h reglib.h reglib.c |
47 | $(NQ) ' CC ' $@ |
48 | - $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ |
49 | + $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS) |
50 | |
51 | install-libreg-headers: |
52 | $(NQ) ' INSTALL libreg-headers' |
53 | -- |
54 | 1.9.0 |
55 |