summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-09-13 10:15:24 +0000
committerRoy Marples <uberlord@gentoo.org>2007-09-13 10:15:24 +0000
commit4f52226929d5c62bbfa832e38576ea62fb2143cf (patch)
tree1f822cc02add23707180036c2b5c95ad2f94822a /dev-libs/confuse
parentFix bug #191668 by calling pkg_setup of perl and java eclasses manually. (diff)
downloadgentoo-2-4f52226929d5c62bbfa832e38576ea62fb2143cf.tar.gz
gentoo-2-4f52226929d5c62bbfa832e38576ea62fb2143cf.tar.bz2
gentoo-2-4f52226929d5c62bbfa832e38576ea62fb2143cf.zip
Link to libintl correctly and work with -j N on non glibc systems
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-libs/confuse')
-rw-r--r--dev-libs/confuse/ChangeLog6
-rw-r--r--dev-libs/confuse/confuse-2.5.ebuild14
-rw-r--r--dev-libs/confuse/files/confuse-2.5-libintl.patch11
3 files changed, 28 insertions, 3 deletions
diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog
index e2dde80ad96c..6f219cbb04b6 100644
--- a/dev-libs/confuse/ChangeLog
+++ b/dev-libs/confuse/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/confuse
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.20 2007/05/08 18:38:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.21 2007/09/13 10:15:24 uberlord Exp $
+
+ 13 Sep 2007; Roy Marples <uberlord@gentoo.org>
+ +files/confuse-2.5-libintl.patch, confuse-2.5.ebuild:
+ Link to libintl correctly and work with -j N on non glibc systems
08 May 2007; Fabian Groffen <grobian@gentoo.org> confuse-2.5.ebuild:
Dropped ppc-macos keyword, see you in prefix
diff --git a/dev-libs/confuse/confuse-2.5.ebuild b/dev-libs/confuse/confuse-2.5.ebuild
index d505a961c1f3..183143eb172d 100644
--- a/dev-libs/confuse/confuse-2.5.ebuild
+++ b/dev-libs/confuse/confuse-2.5.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.5.ebuild,v 1.22 2007/05/08 18:38:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.5.ebuild,v 1.23 2007/09/13 10:15:24 uberlord Exp $
-inherit eutils libtool
+WANT_AUTOMAKE="1.8"
+
+inherit eutils libtool autotools
DESCRIPTION="a configuration file parser library"
HOMEPAGE="http://www.nongnu.org/confuse/"
@@ -24,6 +26,14 @@ src_unpack(){
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-maketest.patch
+
+ # eautoreconf or elibtoolize will refresh install-sh
+ # so that -j N works on FreeBSD
+ rm support/install-sh
+
+ # We should link to libintl correctly
+ epatch "${FILESDIR}"/${P}-libintl.patch
+ eautomake
elibtoolize
}
diff --git a/dev-libs/confuse/files/confuse-2.5-libintl.patch b/dev-libs/confuse/files/confuse-2.5-libintl.patch
new file mode 100644
index 000000000000..60192292c8f6
--- /dev/null
+++ b/dev-libs/confuse/files/confuse-2.5-libintl.patch
@@ -0,0 +1,11 @@
+diff -ur a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am 2004-10-02 16:25:13 +0100
++++ b/src/Makefile.am 2007-09-13 10:48:44 +0100
+@@ -2,6 +2,7 @@
+
+ libconfuse_la_SOURCES = confuse.c lexer.l
+ include_HEADERS = confuse.h
++libconfuse_la_LIBADD = $(LTLIBINTL)
+
+ datadir = @datadir@
+ localedir = $(datadir)/locale