diff options
Diffstat (limited to 'patches/crda-4.15/0001-fix-linking-libreg.patch')
| -rw-r--r-- | patches/crda-4.15/0001-fix-linking-libreg.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/crda-4.15/0001-fix-linking-libreg.patch b/patches/crda-4.15/0001-fix-linking-libreg.patch new file mode 100644 index 000000000..6b566ba04 --- /dev/null +++ b/patches/crda-4.15/0001-fix-linking-libreg.patch @@ -0,0 +1,48 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 30 Jun 2016 12:20:16 +0200 +Subject: [PATCH] fix linking libreg + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 6ca26f341dfa..832399dea8db 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic + CFLAGS += -Wall -g + LDLIBREG += -lreg + LDLIBS += $(LDLIBREG) +-LDLIBS += -lm ++LIBREGLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ + +@@ -40,13 +40,13 @@ 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` ++LIBREGLIBS += `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LIBREGLIBS += -lgcrypt + + $(LIBREG): keys-gcrypt.c + +@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): reglib.c regdb.h reglib.h + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLIBS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' |