diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-12-14 18:47:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-14 18:47:12 +0000 |
| commit | 0df0cda8ec4bc63eece48f9e44053afa9bf4ed42 (patch) | |
| tree | c4cbcfd8314ba000103f44a50c5d6ae195c20936 /net-misc/ntp/files | |
| parent | alpha/ia64/sparc stable wrt #288026 (diff) | |
| download | historical-0df0cda8ec4bc63eece48f9e44053afa9bf4ed42.tar.gz historical-0df0cda8ec4bc63eece48f9e44053afa9bf4ed42.tar.bz2 historical-0df0cda8ec4bc63eece48f9e44053afa9bf4ed42.zip | |
clean up previous commit
Package-Manager: portage-2.2_rc55/cvs/Linux x86_64
Diffstat (limited to 'net-misc/ntp/files')
| -rw-r--r-- | net-misc/ntp/files/4.2.6-as-needed.patch | 45 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.6-linking.patch | 42 |
2 files changed, 42 insertions, 45 deletions
diff --git a/net-misc/ntp/files/4.2.6-as-needed.patch b/net-misc/ntp/files/4.2.6-as-needed.patch deleted file mode 100644 index aa45dec827e6..000000000000 --- a/net-misc/ntp/files/4.2.6-as-needed.patch +++ /dev/null @@ -1,45 +0,0 @@ -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... diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch new file mode 100644 index 000000000000..681029a1763c --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.6-linking.patch @@ -0,0 +1,42 @@ +http://bugs.gentoo.org/296832 +https://support.ntp.org/bugs/show_bug.cgi?id=1418 + +--- ntp-4.2.6/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 +--- ntp-4.2.6/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 = +--- ntp-4.2.6/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 |