diff options
| author | Britney Fransen <brfransen@gmail.com> | 2014-04-16 17:16:01 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2014-04-16 17:16:01 (GMT) |
| commit | 8e41fcf367697e694aa00b9c6e5e0613803548b0 (patch) | |
| tree | 259f2842bc8d453c208a7131c08455c4b40f8128 /abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch | |
| parent | 0fd0dca48ba1af407f134304909c7ccb25f42b61 (diff) | |
| download | linhes_pkgbuild-8e41fcf367697e694aa00b9c6e5e0613803548b0.zip linhes_pkgbuild-8e41fcf367697e694aa00b9c6e5e0613803548b0.tar.gz linhes_pkgbuild-8e41fcf367697e694aa00b9c6e5e0613803548b0.tar.bz2 | |
crda: update to 3.13. refs #961
Diffstat (limited to 'abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch')
| -rw-r--r-- | abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch b/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch new file mode 100644 index 0000000..10dae58 --- /dev/null +++ b/abs/extra/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch @@ -0,0 +1,55 @@ +From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> +Date: Fri, 21 Feb 2014 20:15:32 +0100 +Subject: [PATCH] Makefile: Link libreg.so against the crypto library. + +--- + Makefile | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1f25509..80f4946 100644 +--- a/Makefile ++++ b/Makefile +@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) + LDLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ ++LIBREG_LDFLAGS += -lm + + all: all_noverify verify + +@@ -40,17 +41,19 @@ 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` ++LDCRYPTOLIB := `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LDCRYPTOLIB := -lgcrypt + + $(LIBREG): keys-gcrypt.c + + endif ++LDLIBS += $(LDCRYPTOLIB) ++LIBREG_LDFLAGS += $(LDCRYPTOLIB) + MKDIR ?= mkdir -p + INSTALL ?= install + +@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(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) $^ $(LIBREG_LDFLAGS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.0 + |