summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-04-16 22:42:22 +0000
committerMike Frysinger <vapier@gentoo.org>2010-04-16 22:42:22 +0000
commit2cb005a39bda36b91b3be6da802eb8a3ec4394a0 (patch)
tree4bc4b8a818aaf16d54312616bcc718ba077fc720 /net-misc/ntp/files
parentVersion bump. Introduces new utility hwmixvolume which means a pyalsa depende... (diff)
downloadgentoo-2-2cb005a39bda36b91b3be6da802eb8a3ec4394a0.tar.gz
gentoo-2-2cb005a39bda36b91b3be6da802eb8a3ec4394a0.tar.bz2
gentoo-2-2cb005a39bda36b91b3be6da802eb8a3ec4394a0.zip
Version bump #315651 by Lars Wendler.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/ntp/files')
-rw-r--r--net-misc/ntp/files/ntp-4.2.6_p1-linking.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch b/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
new file mode 100644
index 000000000000..20f87f8edc33
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
@@ -0,0 +1,29 @@
+fix readline linking order
+https://bugs.ntp.org/show_bug.cgi?id=1528
+
+--- ntp-4.2.6_p1/ntpdc/Makefile.in
++++ ntp-4.2.6_p1/ntpdc/Makefile.in
+@@ -267,8 +267,8 @@
+ -I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
+
+ # LDADD might need RESLIB and ADJLIB
+-ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+- ../libntp/libntp.a @LCRYPTO@
++ntpdc_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
++ @EDITLINE_LIBS@ @LCRYPTO@
+
+ # ntpdc-layout doesn't need any additional libraries at all
+ ntpdc_layout_LDADD =
+--- ntp-4.2.6_p1/ntpqMakefile.in
++++ ntp-4.2.6_p1/ntpq/Makefile.in
+@@ -268,8 +268,8 @@
+
+
+ # LDADD might need RESLIB and ADJLIB
+-ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+- ../libntp/libntp.a @LCRYPTO@
++ntpq_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
++ @EDITLINE_LIBS@ @LCRYPTO@
+
+ noinst_HEADERS = ntpq.h
+ noinst_LIBRARIES = libntpq.a