From 03b633b4a906f4c3fc3a7fca278e455d1fc7f72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 28 May 2014 13:47:31 +0200
Subject: [PATCH] Fixed linker arguments for libhogweed.so
---
ChangeLog | 7 +++++++
configure.ac | 9 ++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9d9124a2..674d2136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-28 Niels Möller <nisse@lysator.liu.se>
+
+ * configure.ac (LIBHOGWEED_LIBS): Be explicit and link
+ libhogweed.so with libnettle.so, not -lnettle.
+ (LIBHOGWEED_LINK): Drop -L. flag, no longer needed, and previously
+ not at the correct position in the link command line.
+
2014-05-27 Niels Möller <nisse@lysator.liu.se>
* examples/ecc-benchmark.c: If mpn_sec_powm is available,
diff --git a/configure.ac b/configure.ac
index 025c3bd5..000ab4d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,8 +456,8 @@ case "$host_os" in
LIBHOGWEED_FORLINK=libhogweed.so
LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
- LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)'
- LIBHOGWEED_LIBS='-lnettle -lgmp'
+ LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -G -h $(LIBHOGWEED_SONAME)'
+ LIBHOGWEED_LIBS='libnettle.so -lgmp'
;;
*)
LIBNETTLE_FORLINK=libnettle.so
@@ -469,13 +469,12 @@ case "$host_os" in
LIBHOGWEED_FORLINK=libhogweed.so
LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
- LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -Wl,-soname=$(LIBHOGWEED_SONAME)'
+ LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$(LIBHOGWEED_SONAME)'
# Requested by debian, to make linking with only -lhogweed work
# (does not work in general, e.g., with static linking all of
# -lhogweed -lgmp -lnettle are still required). Also makes dlopen
# of libhogweed.so work, without having to use RTLD_GLOBAL.
- # Depends on -L. above, to locate nettle.so.
- LIBHOGWEED_LIBS='-lnettle -lgmp'
+ LIBHOGWEED_LIBS='libnettle.so -lgmp'
;;
esac
--
GitLab