summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-15 12:52:33 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-15 12:52:33 +0000
commit729a127682b51b45629c759a3a451c6b15d4e570 (patch)
tree8d72f2ae2faf13e4d4cae0e2a601b30cad83b40c /net-misc/ntp
parentRegen libbdnav autotools when needed #296792 by Martin Berkemeier. (diff)
downloadgentoo-2-729a127682b51b45629c759a3a451c6b15d4e570.tar.gz
gentoo-2-729a127682b51b45629c759a3a451c6b15d4e570.tar.bz2
gentoo-2-729a127682b51b45629c759a3a451c6b15d4e570.zip
Further fix the linking patch to link fine with USE=readline/libedit as well.
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/ntp')
-rw-r--r--net-misc/ntp/ChangeLog7
-rw-r--r--net-misc/ntp/files/ntp-4.2.6-linking.patch8
2 files changed, 10 insertions, 5 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index bcf6e50a89f9..5aeca42576b3 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-misc/ntp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.156 2009/12/14 18:47:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.157 2009/12/15 12:52:32 flameeyes Exp $
+
+ 15 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/ntp-4.2.6-linking.patch:
+ Further fix the linking patch to link fine with USE=readline/libedit as
+ well.
14 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+files/ntp-4.2.6-as-needed.patch, ntp-4.2.6.ebuild:
diff --git a/net-misc/ntp/files/ntp-4.2.6-linking.patch b/net-misc/ntp/files/ntp-4.2.6-linking.patch
index 681029a1763c..8318e81f62ae 100644
--- a/net-misc/ntp/files/ntp-4.2.6-linking.patch
+++ b/net-misc/ntp/files/ntp-4.2.6-linking.patch
@@ -22,8 +22,8 @@ https://support.ntp.org/bugs/show_bug.cgi?id=1418
# 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_LDADD = version.o $(LIBOPTS_LDADD) \
++ ../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
# ntpdc-layout doesn't need any additional libraries at all
ntpdc_layout_LDADD =
@@ -35,8 +35,8 @@ https://support.ntp.org/bugs/show_bug.cgi?id=1418
# 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@
++ntpq_LDADD = version.o $(LIBOPTS_LDADD) \
++ ../libntp/libntp.a @LCRYPTO@ @EDITLINE_LIBS@
noinst_HEADERS = ntpq.h
noinst_LIBRARIES = libntpq.a