summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-18 04:45:14 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-07-18 04:45:14 +0000
commitd7e491777f3527e045fa03d8af8c4863a92a2ff3 (patch)
tree843c58b059d1efc2cab8ea5c90d99489acd07635 /app-text/recode
parentstable x86; bug #140656 (diff)
downloadgentoo-2-d7e491777f3527e045fa03d8af8c4863a92a2ff3.tar.gz
gentoo-2-d7e491777f3527e045fa03d8af8c4863a92a2ff3.tar.bz2
gentoo-2-d7e491777f3527e045fa03d8af8c4863a92a2ff3.zip
Move the ppc-macos patch out of if, as it's needed on FreeBSD and does not hinder Linux builds, and export CC/LD or here it finds gcc unable to produce shared libraries.
(Portage version: 2.1.1_pre3-r1)
Diffstat (limited to 'app-text/recode')
-rw-r--r--app-text/recode/ChangeLog7
-rw-r--r--app-text/recode/recode-3.6-r2.ebuild13
2 files changed, 14 insertions, 6 deletions
diff --git a/app-text/recode/ChangeLog b/app-text/recode/ChangeLog
index 13426bcb71ec..f235e9420e9f 100644
--- a/app-text/recode/ChangeLog
+++ b/app-text/recode/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-text/recode
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.34 2006/04/22 22:37:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/ChangeLog,v 1.35 2006/07/18 04:45:14 flameeyes Exp $
+
+ 18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> recode-3.6-r2.ebuild:
+ Move the ppc-macos patch out of if, as it's needed on FreeBSD and does not
+ hinder Linux builds, and export CC/LD or here it finds gcc unable to produce
+ shared libraries.
22 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> recode-3.6-r2.ebuild:
Add ~x86-fbsd keyword.
diff --git a/app-text/recode/recode-3.6-r2.ebuild b/app-text/recode/recode-3.6-r2.ebuild
index 53b90ea3bdb7..ab865f9ffe78 100644
--- a/app-text/recode/recode-3.6-r2.ebuild
+++ b/app-text/recode/recode-3.6-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 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.7 2006/07/17 04:44:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/recode/recode-3.6-r2.ebuild,v 1.8 2006/07/18 04:45:14 flameeyes Exp $
-inherit flag-o-matic eutils libtool
+inherit flag-o-matic eutils libtool toolchain-funcs
DEB_VER=11
DESCRIPTION="Convert files between various character sets"
@@ -21,15 +21,18 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-debian-${DEB_VER}.patch
+ # Needed under FreeBSD, too
+ epatch "${FILESDIR}"/${P}-ppc-macos.diff
+ cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
+
if use ppc-macos; then
- epatch "${FILESDIR}"/${P}-ppc-macos.diff
- cp lib/error.c lib/xstrdup.c src/ || die "file copy failed"
- elibtoolize
append-ldflags -lgettextlib
fi
+ elibtoolize
}
src_compile() {
+ tc-export CC LD
econf $(use_enable nls) || die "econf failed"
emake || die "emake failed"
}