diff options
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libpcre/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/pcre-4.2-macos.patch | 33 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-4.5.ebuild | 5 |
4 files changed, 44 insertions, 5 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index 976e72a6b767..375828b27c6c 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libpcre # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.45 2004/10/08 19:05:12 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.46 2004/10/09 02:03:50 j4rg0n Exp $ + + 08 Oct 2004; Lina Pezzella <j4rg0n@gentoo.org> libpcre-4.5.ebuild: + Added patch for creation of dylibs on ppc-macos. Bug #58165. Thanks to Robin Munn for the submission. + Testing on ppc-macos. 08 Oct 2004; Guy Martin <gmsoft@gentoo.org> libpcre-4.5.ebuild: Marked stable on hppa. diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest index 247b64559856..f428b64bf8b1 100644 --- a/dev-libs/libpcre/Manifest +++ b/dev-libs/libpcre/Manifest @@ -1,11 +1,11 @@ -MD5 fe7967fea44f6e6c02a0e606239267dd ChangeLog 5571 MD5 a4e5e3c4cfce64b7a0f9b9f69ab61f47 libpcre-3.9-r1.ebuild 732 MD5 56be42cd5f53a3fe149f66b4bde5799d libpcre-3.9-r2.ebuild 744 MD5 88fcf07644908c39e5df6f124c97bc41 libpcre-3.9.ebuild 705 MD5 a8f68f5bf3fc2faaef1973b7c44a169f libpcre-4.2-r1.ebuild 855 MD5 248b6d684b6819f97ef28116f8be4cd9 libpcre-4.4.ebuild 1006 -MD5 e26d13b456de49ae32b040cfd8649671 libpcre-4.5.ebuild 1037 +MD5 e628f2757103b58587e24a6b6c9d75bc ChangeLog 5769 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 +MD5 f28e5b315ec05ac0fda493ea934463a5 libpcre-4.5.ebuild 1106 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9 61 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r1 61 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r2 61 @@ -14,3 +14,4 @@ MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61 MD5 4e0522aaf9e2d5a196830b897f2341d2 files/digest-libpcre-4.5 61 MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717 MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437 +MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505 diff --git a/dev-libs/libpcre/files/pcre-4.2-macos.patch b/dev-libs/libpcre/files/pcre-4.2-macos.patch new file mode 100644 index 000000000000..64675604d68b --- /dev/null +++ b/dev-libs/libpcre/files/pcre-4.2-macos.patch @@ -0,0 +1,33 @@ +diff -urN pcre-4.5.orig/configure pcre-4.5/configure +--- pcre-4.5.orig/configure Sun Aug 15 15:29:25 2004 ++++ pcre-4.5/configure Sun Aug 15 15:26:54 2004 +@@ -5122,11 +5122,11 @@ + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. +- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)' ++ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring' + # We need to add '_' to the symbols in $export_symbols first + #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' +- hardcode_direct=yes +- hardcode_shlibpath_var=no ++ hardcode_direct=no ++ hardcode_shlibpath_var=yes + whole_archive_flag_spec='-all_load $convenience' + ;; + +diff -urN pcre-4.5.orig/ltmain.sh pcre-4.5/ltmain.sh +--- pcre-4.5.orig/ltmain.sh Sun Aug 15 15:30:00 2004 ++++ pcre-4.5/ltmain.sh Sun Aug 15 15:32:43 2004 +@@ -2990,6 +2990,11 @@ + done + deplibs="$tmp_deplibs" + done ++ if test "x$verstring" = "x0.0"; then ++ tmp_verstring= ++ else ++ tmp_verstring="$verstring" ++ fi + eval cmds=\"$archive_cmds\" + deplibs="$save_deplibs" + fi diff --git a/dev-libs/libpcre/libpcre-4.5.ebuild b/dev-libs/libpcre/libpcre-4.5.ebuild index b5e438bf3403..d3b021b75702 100644 --- a/dev-libs/libpcre/libpcre-4.5.ebuild +++ b/dev-libs/libpcre/libpcre-4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.5.ebuild,v 1.7 2004/10/08 19:05:12 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.5.ebuild,v 1.8 2004/10/09 02:03:50 j4rg0n Exp $ inherit libtool flag-o-matic eutils gnuconfig @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz LICENSE="as-is" SLOT="3" -KEYWORDS="x86 ~ppc sparc alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390 mips" +KEYWORDS="x86 ~ppc sparc alpha ~arm hppa amd64 ~ia64 ~ppc64 ~s390 mips ~ppc-macos" IUSE="" DEPEND="virtual/libc" @@ -22,6 +22,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/pcre-4.4-uclibc-tuple.patch epatch ${FILESDIR}/pcre-4.2-link.patch + use ppc-macos && epatch ${FILESDIR}/pcre-4.2-macos.patch # position-independent code must used for all shared objects. append-flags -fPIC elibtoolize |