summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Anderson <gentoofan23@gentoo.org>2008-10-14 19:10:55 +0000
committerThomas Anderson <gentoofan23@gentoo.org>2008-10-14 19:10:55 +0000
commit3587b45ef0fb5129749ed3855b9b0b3b18f3d82b (patch)
treee0ed81c1d5a921b8e9a5f4725df9f134c2fa4804 /net-im/jabberd
parentRespect CFLAGS, bug #242004. (diff)
downloadgentoo-2-3587b45ef0fb5129749ed3855b9b0b3b18f3d82b.tar.gz
gentoo-2-3587b45ef0fb5129749ed3855b9b0b3b18f3d82b.tar.bz2
gentoo-2-3587b45ef0fb5129749ed3855b9b0b3b18f3d82b.zip
Add fix for bug #240097 by running LT_OUTPUT earlier in configure(before the check for socket.h). Thanks to Ivan Ivanich for reporting and Mart Raudsepp for hints on the fix.
(Portage version: 2.2_rc12/cvs/Linux 2.6.25.9 x86_64)
Diffstat (limited to 'net-im/jabberd')
-rw-r--r--net-im/jabberd/ChangeLog8
-rw-r--r--net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch10
-rw-r--r--net-im/jabberd/jabberd-1.6.1.1-r1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index d22e4e6a68aa..b2c5f44b66aa 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/jabberd
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.112 2008/08/25 13:08:29 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.113 2008/10/14 19:10:55 gentoofan23 Exp $
+
+ 14 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org>
+ +files/jabberd-1.6.1.1-libtool2.2.patch, jabberd-1.6.1.1-r1.ebuild:
+ Add fix for bug #240097 by running LT_OUTPUT earlier in configure(before the
+ check for socket.h). Thanks to Ivan Ivanich for reporting and Mart Raudsepp
+ for hints on the fix.
25 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org>
jabberd-1.4.4-r3.ebuild, jabberd-1.6.1.1-r1.ebuild:
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch b/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch
new file mode 100644
index 000000000000..d1d8c84cb152
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-libtool2.2.patch
@@ -0,0 +1,10 @@
+--- jabberd14-1.6.1.1-orig/configure.ac 2007-07-18 18:18:40.000000000 -0400
++++ jabberd14-1.6.1.1/configure.ac 2008-10-14 14:30:49.000000000 -0400
+@@ -40,6 +40,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
++m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+
+ AC_SUBST([localedir], ['${datadir}/locale'])
+
diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index 07c06adca53c..40c91fd4ed28 100644
--- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.6 2008/08/25 13:08:29 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.7 2008/10/14 19:10:55 gentoofan23 Exp $
WANT_AUTOMAKE="1.9"
inherit autotools eutils
@@ -46,6 +46,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-sandbox.patch"
epatch "${FILESDIR}/${P}-parallel-make.patch"
epatch "${FILESDIR}/${P}-undefineddebug.patch"
+ epatch "${FILESDIR}/${P}-libtool2.2.patch"
eautoreconf || die "Reconfiguring autotools failed!"
}