diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-29 16:14:07 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-29 16:14:07 +0000 |
| commit | 1836d2e04b9851fde59c647168286e013ff1bd4a (patch) | |
| tree | 76f907b3447e0c86271cca23defb9a27eefb7adf /dev-libs | |
| parent | move related masks closer (diff) | |
| download | gentoo-2-1836d2e04b9851fde59c647168286e013ff1bd4a.tar.gz gentoo-2-1836d2e04b9851fde59c647168286e013ff1bd4a.tar.bz2 gentoo-2-1836d2e04b9851fde59c647168286e013ff1bd4a.zip | |
Add fix by Richard Grenville to fix building when USE="bzip2 -zlib" #418033 by GES.
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch | 26 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-8.30-r2.ebuild | 5 |
3 files changed, 35 insertions, 3 deletions
diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog index 186d1a260ee5..5d07a5b40b0b 100644 --- a/dev-libs/libpcre/ChangeLog +++ b/dev-libs/libpcre/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libpcre # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.199 2012/05/29 15:34:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.200 2012/05/29 16:14:07 vapier Exp $ + + 29 May 2012; Mike Frysinger <vapier@gentoo.org> + +files/libpcre-8.30-bzip2-typo.patch, libpcre-8.30-r2.ebuild: + Add fix by Richard Grenville to fix building when USE="bzip2 -zlib" #418033 by + GES. 29 May 2012; Brent Baude <ranger@gentoo.org> libpcre-8.30-r2.ebuild: Marking libpcre-8.30-r2 ppc64 for bug 417571 diff --git a/dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch b/dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch new file mode 100644 index 000000000000..c088f396529e --- /dev/null +++ b/dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/418033 + +fix building when zlib is disabled but bzip2 is enabled + +patch by Richard Grenville <pyxlcy@gmail.com> + +--- a/pcregrep.c (revision 970) ++++ b/pcregrep.c (working copy) +@@ -1618,7 +1618,7 @@ gzFile ingz = NULL; + BZFILE *inbz2 = NULL; + #endif + +-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2 ++#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2 + int pathlen; + #endif + +@@ -1701,7 +1701,7 @@ skipping was not requested. The scan pro + argument at top level, we don't show the file name, unless we are only showing + the file name, or the filename was forced (-H). */ + +-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2 ++#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2 + pathlen = (int)(strlen(pathname)); + #endif + diff --git a/dev-libs/libpcre/libpcre-8.30-r2.ebuild b/dev-libs/libpcre/libpcre-8.30-r2.ebuild index e615231d2227..59ae315f0a67 100644 --- a/dev-libs/libpcre/libpcre-8.30-r2.ebuild +++ b/dev-libs/libpcre/libpcre-8.30-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r2.ebuild,v 1.7 2012/05/29 15:34:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r2.ebuild,v 1.8 2012/05/29 16:14:07 vapier Exp $ EAPI="4" @@ -33,13 +33,14 @@ S=${WORKDIR}/${MY_P} src_prepare() { sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die + epatch "${FILESDIR}"/${P}-bzip2-typo.patch #418033 elibtoolize } src_configure() { [[ ${CHOST} == *-mint* ]] && append-flags -D_GNU_SOURCE econf \ - --with-match-limit-recursion=$(use recursion-limit && echo 8192 || echo MATCH_LIMIT) \ + --with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \ $(use_enable bzip2 pcregrep-libbz2) \ $(use_enable cxx cpp) \ $(use_enable jit) $(use_enable jit pcregrep-jit) \ |