From 2f4f11637b3c2b1834c895d4452d05f56d538b77 Mon Sep 17 00:00:00 2001 From: dmiller Date: Tue, 16 Sep 2014 03:10:17 +0000 Subject: [PATCH] Fix some library ordering (-lnsock must come before -lnbase) Doesn't matter on most platforms because our own object (.o) files require the symbols from libnbase, so all of them have been linked by the time libnsock is encountered, but vasprintf and asprintf were causing problems on platforms that need the versions defined in libnbase. --- Makefile.in | 2 +- nping/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 29ee3f771..867375d5c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,7 +50,7 @@ export CFLAGS = $(CXXFLAGS) # CFLAGS = $(DEFS) $(INCLS) STATIC = LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) -LIBS = @LIBNBASE_LIBS@ @LIBNSOCK_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(OPENSSL_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBLINEAR_LIBS@ @LIBS@ +LIBS = @LIBNSOCK_LIBS@ @LIBNBASE_LIBS@ @LIBPCRE_LIBS@ @LIBPCAP_LIBS@ $(OPENSSL_LIBS) libnetutil/libnetutil.a @LIBDNET_LIBS@ @LIBLUA_LIBS@ @LIBLINEAR_LIBS@ @LIBS@ OPENSSL_LIBS = @OPENSSL_LIBS@ # LIBS = -lefence @LIBS@ # LIBS = -lrmalloc @LIBS@ diff --git a/nping/Makefile.in b/nping/Makefile.in index 03c637811..be83b4d97 100644 --- a/nping/Makefile.in +++ b/nping/Makefile.in @@ -48,7 +48,7 @@ export CFLAGS = $(CXXFLAGS) STATIC = LDFLAGS = @LDFLAGS@ $(DBGFLAGS) $(STATIC) OPENSSL_LIBS = @OPENSSL_LIBS@ -LIBS = $(NBASEDIR)/libnbase.a $(NSOCKDIR)/src/libnsock.a ../libnetutil/libnetutil.a $(OPENSSL_LIBS) @LIBPCAP_LIBS@ @LIBDNET_LIBS@ @LIBS@ +LIBS = $(NSOCKDIR)/src/libnsock.a $(NBASEDIR)/libnbase.a ../libnetutil/libnetutil.a $(OPENSSL_LIBS) @LIBPCAP_LIBS@ @LIBDNET_LIBS@ @LIBS@ # LIBS = -lefence @LIBS@ # LIBS = -lrmalloc @LIBS@ INSTALL = @INSTALL@