Commit 03b633b4 authored by Niels Möller's avatar Niels Möller

Fixed linker arguments for libhogweed.so

parent 52d9adab
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> 2014-05-27 Niels Möller <nisse@lysator.liu.se>
* examples/ecc-benchmark.c: If mpn_sec_powm is available, * examples/ecc-benchmark.c: If mpn_sec_powm is available,
......
...@@ -456,8 +456,8 @@ case "$host_os" in ...@@ -456,8 +456,8 @@ case "$host_os" in
LIBHOGWEED_FORLINK=libhogweed.so LIBHOGWEED_FORLINK=libhogweed.so
LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)' LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -G -h $(LIBHOGWEED_SONAME)'
LIBHOGWEED_LIBS='-lnettle -lgmp' LIBHOGWEED_LIBS='libnettle.so -lgmp'
;; ;;
*) *)
LIBNETTLE_FORLINK=libnettle.so LIBNETTLE_FORLINK=libnettle.so
...@@ -469,13 +469,12 @@ case "$host_os" in ...@@ -469,13 +469,12 @@ case "$host_os" in
LIBHOGWEED_FORLINK=libhogweed.so LIBHOGWEED_FORLINK=libhogweed.so
LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' 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 # Requested by debian, to make linking with only -lhogweed work
# (does not work in general, e.g., with static linking all of # (does not work in general, e.g., with static linking all of
# -lhogweed -lgmp -lnettle are still required). Also makes dlopen # -lhogweed -lgmp -lnettle are still required). Also makes dlopen
# of libhogweed.so work, without having to use RTLD_GLOBAL. # of libhogweed.so work, without having to use RTLD_GLOBAL.
# Depends on -L. above, to locate nettle.so. LIBHOGWEED_LIBS='libnettle.so -lgmp'
LIBHOGWEED_LIBS='-lnettle -lgmp'
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment