diff options
Diffstat (limited to 'dev-libs/libpcre')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/libpcre/Manifest | 14 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/pcre-4.2-link.patch | 11 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch | 46 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-4.4.ebuild | 17 |
5 files changed, 83 insertions, 13 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index 76c756a50f66..47c078a2b8f5 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,12 @@ # 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.37 2004/07/02 04:48:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.38 2004/07/12 18:43:02 solar Exp $ + + 12 Jul 2004; <solar@gentoo.org> libpcre-4.4.ebuild, + files/pcre-4.2-link.patch, files/pcre-4.4-uclibc-tuple.patch: + added two patches that came from redhat, one adds the uclibc tuple for + configure and the other fixes linking problems. enabled PIC for all arches vs + hppa/amd64 alone. 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> libpcre-3.9-r1.ebuild, libpcre-3.9-r2.ebuild, libpcre-3.9.ebuild, diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest index 791867bb4781..d18a56f52ac4 100644 --- a/dev-libs/libpcre/Manifest +++ b/dev-libs/libpcre/Manifest @@ -1,12 +1,14 @@ -MD5 508b43a03193129b231619feeee11861 ChangeLog 4546 -MD5 111d4c2a8993378b0219585aafcc39ac libpcre-3.9-r1.ebuild 726 -MD5 4de57f20daa6ef59b9f3fe2a315bb593 libpcre-3.9-r2.ebuild 738 -MD5 5750d0d8c5c047293590c223ad738247 libpcre-3.9.ebuild 701 MD5 a8f68f5bf3fc2faaef1973b7c44a169f libpcre-4.2-r1.ebuild 855 -MD5 4ae1d34a2e9f4ac7034551310cff74d4 libpcre-4.4.ebuild 874 +MD5 5750d0d8c5c047293590c223ad738247 libpcre-3.9.ebuild 701 +MD5 4de57f20daa6ef59b9f3fe2a315bb593 libpcre-3.9-r2.ebuild 738 +MD5 28053fe2794fb158f435c163f8a287f5 libpcre-4.4.ebuild 1011 +MD5 f50ac6809814e69da0caea11f32fb878 ChangeLog 4838 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259 -MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9 61 +MD5 111d4c2a8993378b0219585aafcc39ac libpcre-3.9-r1.ebuild 726 +MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717 +MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r1 61 MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9-r2 61 MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61 +MD5 0baca84ddbe0223b3e71da8f829841bc files/digest-libpcre-3.9 61 MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61 diff --git a/dev-libs/libpcre/files/pcre-4.2-link.patch b/dev-libs/libpcre/files/pcre-4.2-link.patch new file mode 100644 index 000000000000..a2d154d75c84 --- /dev/null +++ b/dev-libs/libpcre/files/pcre-4.2-link.patch @@ -0,0 +1,11 @@ +--- pcre-4.2/Makefile.in.mps 2003-05-20 18:10:34.000000000 +0200 ++++ pcre-4.2/Makefile.in 2003-05-20 18:11:10.000000000 +0200 +@@ -89,7 +89,7 @@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) + @ON_WINDOWS@LINK = $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L.libs + @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir) +-LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir) ++LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L. -L.libs + LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(top_srcdir) + + # These are the version numbers for the shared libraries diff --git a/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch b/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch new file mode 100644 index 000000000000..21c83b2caa83 --- /dev/null +++ b/dev-libs/libpcre/files/pcre-4.4-uclibc-tuple.patch @@ -0,0 +1,46 @@ +--- pcre-4.4/configure.mps Wed Jan 28 15:58:44 2004 ++++ pcre-4.4/configure Wed Jan 28 16:11:17 2004 +@@ -2811,6 +2811,11 @@ + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/uClibc-*.so` ++ ;; ++ + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' +@@ -4148,6 +4153,7 @@ + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in + linux-gnu*) ;; ++linux-uclibc*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac + +@@ -5663,6 +5669,23 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++linux-uclibc*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ++ soname_spec='${libname}${release}.so$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ # Assume using the uClibc dynamic linker is in use. ++ dynamic_linker='uClibc ld.so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no diff --git a/dev-libs/libpcre/libpcre-4.4.ebuild b/dev-libs/libpcre/libpcre-4.4.ebuild index 11a29f0e45cc..9d7a44946b91 100644 --- a/dev-libs/libpcre/libpcre-4.4.ebuild +++ b/dev-libs/libpcre/libpcre-4.4.ebuild @@ -1,8 +1,8 @@ # 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.4.ebuild,v 1.14 2004/07/02 04:48:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-4.4.ebuild,v 1.15 2004/07/12 18:43:02 solar Exp $ -inherit libtool flag-o-matic +inherit libtool flag-o-matic eutils DESCRIPTION="Perl-compatible regular expression library" HOMEPAGE="http://www.pcre.org/" @@ -17,11 +17,16 @@ DEPEND="virtual/libc" S=${WORKDIR}/pcre-${PV} +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/pcre-4.4-uclibc-tuple.patch + epatch ${FILESDIR}/pcre-4.2-link.patch +} + src_compile() { - if [ "${ARCH}" = "amd64" -o "${ARCH}" = "hppa" ] - then - append-flags -fPIC - fi + # position-independent code must used for all shared objects. + append-flags -fPIC elibtoolize econf --enable-utf8 || die make || die |