diff options
| author |   Lina Pezzella <j4rg0n@gentoo.org> | 2005-06-26 06:16:27 +0000 |
|---|---|---|
| committer | Lina Pezzella <j4rg0n@gentoo.org> | 2005-06-26 06:16:27 +0000 |
| commit | a9d324ec52dab31ae1cffa2258b4da7295eec060 (patch) | |
| tree | 6ee3b4bbb936e19d454f6af83be64f2e17348981 /dev-libs/libpcre | |
| parent | Version bump. Mark previous version stable on x86. (diff) | |
| download | gentoo-2-a9d324ec52dab31ae1cffa2258b4da7295eec060.tar.gz gentoo-2-a9d324ec52dab31ae1cffa2258b4da7295eec060.tar.bz2 gentoo-2-a9d324ec52dab31ae1cffa2258b4da7295eec060.zip | |
Fixed dirty hack.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-libs/libpcre')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/pcre-5.0-macos.patch | 11 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-5.0.ebuild | 16 |
3 files changed, 6 insertions, 26 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index 6f5d54306339..34489808ded1 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libpcre # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.58 2005/06/10 20:40:29 j4rg0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.59 2005/06/26 06:16:27 j4rg0n Exp $ + + 26 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> libpcre-5.0.ebuild: + Fixed dirty dylib hack 10 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> libpcre-5.0.ebuild: Removed elibtoolize for ppc-macos. Fixes Bug #95384. Thanks to kito and diff --git a/dev-libs/libpcre/files/pcre-5.0-macos.patch b/dev-libs/libpcre/files/pcre-5.0-macos.patch deleted file mode 100644 index b51a2996cc12..000000000000 --- a/dev-libs/libpcre/files/pcre-5.0-macos.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre-5.0/configure.orig Sun Feb 13 15:07:14 2005 -+++ pcre-5.0/configure Sun Feb 13 15:09:10 2005 -@@ -6799,7 +6799,7 @@ - link_all_deplibs=yes - if test "$GCC" = yes ; then - output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname.dylib $verstring' - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' diff --git a/dev-libs/libpcre/libpcre-5.0.ebuild b/dev-libs/libpcre/libpcre-5.0.ebuild index c2b55f62921d..bdb0d93362d2 100644 --- a/dev-libs/libpcre/libpcre-5.0.ebuild +++ b/dev-libs/libpcre/libpcre-5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.12 2005/06/10 20:40:29 j4rg0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-5.0.ebuild,v 1.13 2005/06/26 06:16:27 j4rg0n Exp $ inherit libtool flag-o-matic eutils @@ -21,8 +21,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/pcre-5.0-uclibc-tuple.patch - epatch "${FILESDIR}"/pcre-4.2-link.patch - use ppc-macos && epatch "${FILESDIR}"/pcre-5.0-macos.patch + use ppc-macos || epatch "${FILESDIR}"/pcre-4.2-link.patch # position-independent code must used for all shared objects. append-flags -fPIC @@ -38,17 +37,6 @@ src_compile() { src_install() { make DESTDIR="${D}" install || die - if use ppc-macos; then - cd "${D}"/usr/lib - for i in libpcre{,.0.0.1,.0} libpcreposix{,.0.0.0,.0}; do - mv $i $i.dylib - done - ln -sf libpcre.0.0.1.dylib libpcre.dylib - ln -sf libpcre.0.0.1.dylib libpcre.0.dylib - ln -sf libpcreposix.0.0.0.dylib libpcreposix.dylib - ln -sf libpcreposix.0.0.0.dylib libpcreposix.0.dylib - fi - dodoc AUTHORS INSTALL NON-UNIX-USE dodoc doc/*.txt doc/Tech.Notes dohtml -r doc/* |