Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libpcre/files: libpcre-8.30-bzip2-typo.patch
Date: Tue, 29 May 2012 16:14:22
Message-Id: 20120529161407.BB2452004B@flycatcher.gentoo.org
1 vapier 12/05/29 16:14:07
2
3 Added: libpcre-8.30-bzip2-typo.patch
4 Log:
5 Add fix by Richard Grenville to fix building when USE="bzip2 -zlib" #418033 by GES.
6
7 (Portage version: HEAD/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libpcre/files/libpcre-8.30-bzip2-typo.patch?rev=1.1&content-type=text/plain
14
15 Index: libpcre-8.30-bzip2-typo.patch
16 ===================================================================
17 https://bugs.gentoo.org/418033
18
19 fix building when zlib is disabled but bzip2 is enabled
20
21 patch by Richard Grenville <pyxlcy@×××××.com>
22
23 --- a/pcregrep.c (revision 970)
24 +++ b/pcregrep.c (working copy)
25 @@ -1618,7 +1618,7 @@ gzFile ingz = NULL;
26 BZFILE *inbz2 = NULL;
27 #endif
28
29 -#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
30 +#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
31 int pathlen;
32 #endif
33
34 @@ -1701,7 +1701,7 @@ skipping was not requested. The scan pro
35 argument at top level, we don't show the file name, unless we are only showing
36 the file name, or the filename was forced (-H). */
37
38 -#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
39 +#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
40 pathlen = (int)(strlen(pathname));
41 #endif