[patch] Change library order

gentoo296832a.patch (text/plain), 3.90 KB, created by Martin von Gagern on 2009-12-14 12:23:44 UTC

Index: ntp-4.2.6/ntpd/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpd/Makefile.am
+++ ntp-4.2.6/ntpd/Makefile.am
@@ -83,8 +83,8 @@ man_MANS=	ntpd.1
 # floor                               refclock_wwv.o
 # which are (usually) provided by -lm.
 keyword_gen_LDADD = ../libntp/libntp.a
-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
 DISTCLEANFILES = keyword-gen .version version.c
Index: ntp-4.2.6/ntpdc/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpdc/Makefile.am
+++ ntp-4.2.6/ntpdc/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
 	-I$(top_srcdir)/lib/isc/nothreads/include \
 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD=	version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-		../libntp/libntp.a
+ntpdc_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+		../libntp/libntp.a @LCRYPTO@
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD=
 DISTCLEANFILES=	.version version.c
Index: ntp-4.2.6/ntpq/Makefile.am
===================================================================
--- ntp-4.2.6.orig/ntpq/Makefile.am
+++ ntp-4.2.6/ntpq/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I$
 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD=	version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-		../libntp/libntp.a
+ntpq_LDADD=	version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+		../libntp/libntp.a @LCRYPTO@
 noinst_HEADERS=	ntpq.h
 noinst_LIBRARIES=	libntpq.a
 # HMS: I don't think we need libntpq_a_LIBADD...
Index: ntp-4.2.6/ntpd/Makefile.in
===================================================================
--- ntp-4.2.6.orig/ntpd/Makefile.in
+++ ntp-4.2.6/ntpd/Makefile.in
@@ -358,8 +358,8 @@ man_MANS = ntpd.1
 # floor                               refclock_wwv.o
 # which are (usually) provided by -lm.
 keyword_gen_LDADD = ../libntp/libntp.a
-ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a
-ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a
+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
+ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
 ntpdsim_CFLAGS = $(CFLAGS) -DSIM
 check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
 DISTCLEANFILES = keyword-gen .version version.c
Index: ntp-4.2.6/ntpdc/Makefile.in
===================================================================
--- ntp-4.2.6.orig/ntpdc/Makefile.in
+++ ntp-4.2.6/ntpdc/Makefile.in
@@ -264,8 +264,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
 
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-		../libntp/libntp.a
+ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+		../libntp/libntp.a @LCRYPTO@
 
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD = 
Index: ntp-4.2.6/ntpq/Makefile.in
===================================================================
--- ntp-4.2.6.orig/ntpq/Makefile.in
+++ ntp-4.2.6/ntpq/Makefile.in
@@ -265,8 +265,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
 
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
-		../libntp/libntp.a
+ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+		../libntp/libntp.a @LCRYPTO@
 
 noinst_HEADERS = ntpq.h
 noinst_LIBRARIES = libntpq.a