From eaff78f537b6bbac68ecdb782680bc02f2f76e4d Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sat, 30 Apr 2005 11:29:57 +0000 Subject: Added a proper fix for rpath issue, thanks to Azarah. (Portage version: 2.0.51.20-r5) --- dev-libs/libiconv/ChangeLog | 9 +++++- dev-libs/libiconv/Manifest | 3 ++ dev-libs/libiconv/files/digest-libiconv-1.9.2 | 1 - dev-libs/libiconv/files/digest-libiconv-1.9.2-r1 | 1 - dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 | 1 + .../libiconv/files/libiconv-1.9.2-RPATH-fix.patch | 35 ++++++++++++++++++++++ dev-libs/libiconv/libiconv-1.9.2-r1.ebuild | 35 ---------------------- dev-libs/libiconv/libiconv-1.9.2-r2.ebuild | 34 +++++++++++++++++++++ dev-libs/libiconv/libiconv-1.9.2.ebuild | 27 ----------------- 9 files changed, 81 insertions(+), 65 deletions(-) delete mode 100644 dev-libs/libiconv/files/digest-libiconv-1.9.2 delete mode 100644 dev-libs/libiconv/files/digest-libiconv-1.9.2-r1 create mode 100644 dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 create mode 100644 dev-libs/libiconv/files/libiconv-1.9.2-RPATH-fix.patch delete mode 100644 dev-libs/libiconv/libiconv-1.9.2-r1.ebuild create mode 100644 dev-libs/libiconv/libiconv-1.9.2-r2.ebuild delete mode 100644 dev-libs/libiconv/libiconv-1.9.2.ebuild (limited to 'dev-libs/libiconv') diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog index 2faff26b5454..4382d5395fcf 100644 --- a/dev-libs/libiconv/ChangeLog +++ b/dev-libs/libiconv/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libiconv # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.10 2005/04/30 03:22:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.11 2005/04/30 11:29:57 flameeyes Exp $ + +*libiconv-1.9.2-r2 (30 Apr 2005) + + 30 Apr 2005; Diego Pettenò + +files/libiconv-1.9.2-RPATH-fix.patch, -libiconv-1.9.2.ebuild, + -libiconv-1.9.2-r1.ebuild, +libiconv-1.9.2-r2.ebuild: + Added a proper fix for rpath issue, thanks to Azarah. *libiconv-1.9.2-r1 (30 Apr 2005) diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest index 1b9afe7b67ef..1feb89a20f14 100644 --- a/dev-libs/libiconv/Manifest +++ b/dev-libs/libiconv/Manifest @@ -2,5 +2,8 @@ MD5 32653a886d0db5416374e26c5e912efe ChangeLog 1508 MD5 f90c6b5ccd48096b82a7842c5994583b metadata.xml 469 MD5 ae076392c21767f9af504afac139e480 libiconv-1.9.2-r1.ebuild 858 MD5 e66d2257070d9509a3550ef987d85c39 libiconv-1.9.2.ebuild 670 +MD5 ad4a3d4aee39a9befa51837abd8a3ddc libiconv-1.9.2-r2.ebuild 765 MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2 67 MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2-r1 67 +MD5 97aebb7d7ded50f07b44c23768d25928 files/libiconv-1.9.2-RPATH-fix.patch 1906 +MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2-r2 67 diff --git a/dev-libs/libiconv/files/digest-libiconv-1.9.2 b/dev-libs/libiconv/files/digest-libiconv-1.9.2 deleted file mode 100644 index e124274679fd..000000000000 --- a/dev-libs/libiconv/files/digest-libiconv-1.9.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 6bc300365053c815b10b800a21e0bc7e libiconv-1.9.2.tar.gz 3919945 diff --git a/dev-libs/libiconv/files/digest-libiconv-1.9.2-r1 b/dev-libs/libiconv/files/digest-libiconv-1.9.2-r1 deleted file mode 100644 index e124274679fd..000000000000 --- a/dev-libs/libiconv/files/digest-libiconv-1.9.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6bc300365053c815b10b800a21e0bc7e libiconv-1.9.2.tar.gz 3919945 diff --git a/dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 b/dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 new file mode 100644 index 000000000000..e124274679fd --- /dev/null +++ b/dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 @@ -0,0 +1 @@ +MD5 6bc300365053c815b10b800a21e0bc7e libiconv-1.9.2.tar.gz 3919945 diff --git a/dev-libs/libiconv/files/libiconv-1.9.2-RPATH-fix.patch b/dev-libs/libiconv/files/libiconv-1.9.2-RPATH-fix.patch new file mode 100644 index 000000000000..b8e9b88b61f2 --- /dev/null +++ b/dev-libs/libiconv/files/libiconv-1.9.2-RPATH-fix.patch @@ -0,0 +1,35 @@ +--- libiconv-1.9.2/src/Makefile.in 2005-04-30 12:33:34.000000000 +0200 ++++ libiconv-1.9.2.az/src/Makefile.in 2005-04-30 12:43:57.000000000 +0200 +@@ -52,7 +52,7 @@ + # i.e. during "make install". The intermediate 'iconv' executable is built + # without internationalization and not linked with libintl. + +-all : iconv_no_i18n iconv.@OBJEXT@ ++all : iconv_no_i18n iconv.@OBJEXT@ iconv + test `ls -ld . | sed -e 's/^d\(.........\).*/\1/'` = rwxrwxrwx || chmod 777 . + + # This is the temporary iconv executable, without internationalization. +@@ -77,6 +77,12 @@ + @SET_RELOCATABLE@ + iconv_LDFLAGS = `if test -n '$(RELOCATABLE_LDFLAGS)'; then $(RELOCATABLE_LDFLAGS) $(bindir); fi` + ++iconv: iconv.@OBJEXT@ ++ case "@host_os@" in \ ++ hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L../lib -liconv @LIBINTL@ -o iconv;; \ ++ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \ ++ esac ++ + # During "make install", we can build the final iconv executable. + # On HP-UX, in order to ensure that the new libiconv.sl will override the old + # one that is hardcoded in libintl.sl, we need to mention libiconv.sl before +@@ -90,10 +96,6 @@ + if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi + if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi +- case "@host_os@" in \ +- hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ +- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ +- esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv + + installdirs : force diff --git a/dev-libs/libiconv/libiconv-1.9.2-r1.ebuild b/dev-libs/libiconv/libiconv-1.9.2-r1.ebuild deleted file mode 100644 index 7e32c4473be7..000000000000 --- a/dev-libs/libiconv/libiconv-1.9.2-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.9.2-r1.ebuild,v 1.1 2005/04/30 03:22:28 flameeyes Exp $ - -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libiconv/" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~x86 ~ppc ~amd64 -x86-fbsd" -IUSE="nls" - -RDEPEND="virtual/libc - !sys-libs/glibc" -DEPEND="${RDEPEND} - app-admin/chrpath" - -src_compile() { - econf \ - $(use_enable nls) \ - || die "econf failed" - - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - # Temporary fix for rpath removing - chrpath -d ${D}/usr/bin/iconv || die - - dodoc ABOUT-NLS DESIGN NEWS NOTES PORTS README* THANKS ChangeLog -} - diff --git a/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild b/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild new file mode 100644 index 000000000000..c328812281ff --- /dev/null +++ b/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild,v 1.1 2005/04/30 11:29:57 flameeyes Exp $ + +inherit eutils + +DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" +SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz" +HOMEPAGE="http://www.gnu.org/software/libiconv/" + +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="~x86 ~sparc ~ppc ~amd64" +IUSE="nls" + +DEPEND="virtual/libc + !sys-libs/glibc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-RPATH-fix.patch +} + +src_compile() { + econf \ + $(use_enable nls) \ + || die "econf failed" + emake || die +} + +src_install() { + make DESTDIR=${D} install || die +} diff --git a/dev-libs/libiconv/libiconv-1.9.2.ebuild b/dev-libs/libiconv/libiconv-1.9.2.ebuild deleted file mode 100644 index 66dc67387bff..000000000000 --- a/dev-libs/libiconv/libiconv-1.9.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.9.2.ebuild,v 1.1 2005/04/18 22:15:09 flameeyes Exp $ - -DESCRIPTION="GNU charset conversion library for libc which doesn't implement it" -SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libiconv/" - -SLOT="0" -LICENSE="LGPL-2.1" -KEYWORDS="~x86 ~sparc ~ppc ~amd64" -IUSE="nls" - -DEPEND="virtual/libc - !sys-libs/glibc" - -src_compile() { - econf \ - $(use_enable nls) \ - || die "econf failed" - emake || die -} - -src_install() { - make DESTDIR=${D} install || die -} - -- cgit v1.2.3-65-gdbad