summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-08-31 13:33:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-08-31 13:33:34 +0000
commit4eec148d70b0bba2386fa267ea5437c55ba4e190 (patch)
treef74dc143c4ba4cc4c3a16ed4c073a336bafdf4be /dev-libs
parentamd64 stable, bug #212344 (diff)
downloadgentoo-2-4eec148d70b0bba2386fa267ea5437c55ba4e190.tar.gz
gentoo-2-4eec148d70b0bba2386fa267ea5437c55ba4e190.tar.bz2
gentoo-2-4eec148d70b0bba2386fa267ea5437c55ba4e190.zip
Fix linking of libiconv where needed.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libcdio/ChangeLog5
-rw-r--r--dev-libs/libcdio/libcdio-0.80.ebuild10
2 files changed, 13 insertions, 2 deletions
diff --git a/dev-libs/libcdio/ChangeLog b/dev-libs/libcdio/ChangeLog
index 3479f5b59d47..261d0d444c92 100644
--- a/dev-libs/libcdio/ChangeLog
+++ b/dev-libs/libcdio/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libcdio
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.101 2008/07/16 08:37:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/ChangeLog,v 1.102 2008/08/31 13:33:34 flameeyes Exp $
+
+ 31 Aug 2008; Diego Pettenò <flameeyes@gentoo.org> libcdio-0.80.ebuild:
+ Fix linking of libiconv where needed.
16 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+files/libcdio-0.80-fbsd.patch, libcdio-0.80.ebuild:
diff --git a/dev-libs/libcdio/libcdio-0.80.ebuild b/dev-libs/libcdio/libcdio-0.80.ebuild
index 9cf0a808bbde..a444da1caeca 100644
--- a/dev-libs/libcdio/libcdio-0.80.ebuild
+++ b/dev-libs/libcdio/libcdio-0.80.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/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.6 2008/07/16 08:37:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcdio/libcdio-0.80.ebuild,v 1.7 2008/08/31 13:33:34 flameeyes Exp $
EAPI=1
@@ -32,6 +32,14 @@ src_unpack() {
sed -i -e 's:noinst_PROGRAMS:EXTRA_PROGRAMS:' test/Makefile.am \
|| die "unable to remove testdefault build"
+ # Fix building against libiconv
+ sed -i -e 's:@LIBICONV@:$(LTLIBICONV):' lib/driver/Makefile.am \
+ || die "unable to fix libiconv link - part 1"
+
+ find . -name Makefile.am -print0 | xargs -0 \
+ sed -i -e 's:$(LIBICONV):$(LTLIBICONV):' \
+ || die "unable to fix libiconv link - part 2"
+
eautomake
elibtoolize
}