From 1645e5b86fe00518b2b7c362fcac8655ebd1959d Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 20 Mar 2007 13:42:55 +0000 Subject: [PATCH] Build against gettext system libraries and headers instead of included ones, #171540. Package-Manager: portage-2.1.2.2 --- app-text/recode/ChangeLog | 6 +++++- app-text/recode/recode-3.6-r2.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog index cdcdda5fb492..20cc1e21c3a9 100644 --- a/app-text/recode/ChangeLog +++ b/app-text/recode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/recode # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.45 2007/01/22 08:30:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.46 2007/03/20 13:42:55 uberlord Exp $ + + 20 Mar 2007; Roy Marples recode-3.6-r2.ebuild: + Build against gettext system libraries and headers instead of included ones, + #171540. 22 Jan 2007; Diego Pettenò recode-3.6-r1.ebuild, recode-3.6-r2.ebuild: diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild index 4b11edf1e221..83261845812a 100644 --- a/app-text/recode/recode-3.6-r2.ebuild +++ b/app-text/recode/recode-3.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.19 2007/01/22 08:30:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.20 2007/03/20 13:42:55 uberlord Exp $ inherit flag-o-matic eutils libtool toolchain-funcs @@ -25,15 +25,15 @@ src_unpack() { epatch "${FILESDIR}"/${P}-ppc-macos.diff cp lib/error.c lib/xstrdup.c src/ || die "file copy failed" - if use ppc-macos; then - append-ldflags -lgettextlib -lintl - fi + use ppc-macos && append-ldflags -lgettextlib elibtoolize } src_compile() { tc-export CC LD - econf $(use_enable nls) || die "econf failed" + # --without-included-gettext means we always use system headers + # and library + econf --without-included-gettext $(use_enable nls) || die "econf failed" emake || die "emake failed" } -- 2.26.2