RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/ CHANGES Makefile.am autogen.sh configure.ac devtool.co...

From: Jeff Johnson <n3npq@mac.com>
Date: Thu 15 Jan 2009 - 03:42:10 CET
Message-id: <B4BD9601-C21F-4BEE-B607-33238FC273BC@mac.com>
If you happen __NOT__ to be running
	PLD
	Debian derivatives
	Ark
	Owl
linux, then this patch accomplishes PCRE internal sufficiently
for yum+rpmlib to function with regfoo(3) symbol confusions.

There;s a bit more cleanup to do within PCRE making it ready for CVS.

I'll get to that tomorrow.


On Jan 14, 2009, at 9:11 PM, Jeff Johnson wrote:

>  RPM Package Manager, CVS Repository
>  http://rpm5.org/cvs/
>   
> ____________________________________________________________________________
>
>  Server: rpm5.org                         Name:   Jeff Johnson
>  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
>  Module: rpm                              Date:   15-Jan-2009 03:11:45
>  Branch: HEAD                             Handle: 2009011502114302
>
>  Modified files:
>    rpm                     CHANGES Makefile.am autogen.sh configure.ac
>                            devtool.conf
>    rpm/lib                 Makefile.am
>    rpm/misc                Makefile.am librpmmisc.vers
>    rpm/rpmdb               Makefile.am
>    rpm/rpmio               Makefile.am
>    rpm/tools               Makefile.am
>
>  Log:
>    - jbj: pcre: punish PLD with internal bloat until the trivial  
> AutoFu
>    exists.
>
>  Summary:
>    Revision    Changes     Path
>    1.2735      +1  -0      rpm/CHANGES
>    2.225       +1  -0      rpm/Makefile.am
>    2.99        +3  -0      rpm/autogen.sh
>    2.335       +8  -2      rpm/configure.ac
>    2.259       +3  -2      rpm/devtool.conf
>    2.188       +1  -0      rpm/lib/Makefile.am
>    1.39        +2  -0      rpm/misc/Makefile.am
>    1.13        +8  -0      rpm/misc/librpmmisc.vers
>    1.107       +1  -0      rpm/rpmdb/Makefile.am
>    1.202       +1  -0      rpm/rpmio/Makefile.am
>    2.116       +1  -0      rpm/tools/Makefile.am
>   
> ____________________________________________________________________________
>
>  patch -p0 <<'@@ .'
>  Index: rpm/CHANGES
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.2734 -r1.2735 CHANGES
>  --- rpm/CHANGES	11 Jan 2009 22:02:15 -0000	1.2734
>  +++ rpm/CHANGES	15 Jan 2009 02:11:43 -0000	1.2735
>  @@ -1,5 +1,6 @@
>
>   5.2a2 -> 5.2a3:
>  +    - jbj: pcre: punish PLD with internal bloat until the trivial  
> AutoFu exists.
>       - jbj: rpmbuild: use anchored patterns for data validation.
>       - jbj: move rpmgrep and man page from rpmio/ to tools/ and  
> install.
>       - jbj: EVRtuple: eliminate the old EVR parser.
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.224 -r2.225 Makefile.am
>  --- rpm/Makefile.am	4 Nov 2008 16:08:16 -0000	2.224
>  +++ rpm/Makefile.am	15 Jan 2009 02:11:43 -0000	2.225
>  @@ -55,6 +55,7 @@
>   	@WITH_ZLIB_SUBDIR@ \
>   	@WITH_LUA_SUBDIR@ \
>   	@WITH_FILE_SUBDIR@ \
>  +	@WITH_PCRE_SUBDIR@ \
>   	@WITH_XAR_SUBDIR@ \
>   	@WITH_LZMA_SUBDIR@ \
>   	misc \
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/autogen.sh
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.98 -r2.99 autogen.sh
>  --- rpm/autogen.sh	24 Sep 2008 21:20:07 -0000	2.98
>  +++ rpm/autogen.sh	15 Jan 2009 02:11:43 -0000	2.99
>  @@ -40,6 +40,9 @@
>   [ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE"  
> # && exit 1
>   [ "`gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\ 
> \);\\1;'`" != "$GTT" ] && echo "$USAGE" # && exit 1
>
>  +#echo "===> pcre"
>  +#( cd pcre && sh ./autogen.sh --noconfigure "$@" )
>  +#echo "<=== pcre"
>   echo "===> lzma"
>   ( cd lzma && sh ./autogen.sh --noconfigure "$@" )
>   echo "<=== lzma"
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/configure.ac
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.334 -r2.335 configure.ac
>  --- rpm/configure.ac	4 Jan 2009 22:57:04 -0000	2.334
>  +++ rpm/configure.ac	15 Jan 2009 02:11:43 -0000	2.335
>  @@ -999,6 +999,7 @@
>       [], [])
>
>   dnl # libLZMA
>  +WITH_LZMA_INTERNAL=false
>   RPM_CHECK_LIB(
>       [libLZMA], [lzma],
>       [lzma], [lzma_auto_decoder], [lzma.h],
>  @@ -1172,11 +1173,16 @@
>   AM_CONDITIONAL(USE_LUA_SOCKET, [ test ".$USE_LUA_SOCKET" = .yes ])
>
>   dnl # PCRE
>  +WITH_PCRE_INTERNAL=false
>   RPM_CHECK_LIB(
>       [PCRE], [pcre],
>       [pcre], [pcre_compile], [pcre.h],
>  -    [no,external:none], [],
>  -    [ dnl # make sure PCRE POSIX API can be really _USED_ by RPM
>  +    [yes,internal:external:none], [pcre],
>  +    [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
>  +          WITH_PCRE_INTERNAL=true
>  +          AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have  
> <pcre.h>])
>  +      fi
>  +      dnl # make sure PCRE POSIX API can be really _USED_ by RPM
>         LIBS_SAVED="$LIBS"
>         LIBS="-lpcreposix $LIBS"
>         AC_LINK_IFELSE([
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/devtool.conf
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.258 -r2.259 devtool.conf
>  --- rpm/devtool.conf	14 Jan 2009 20:48:23 -0000	2.258
>  +++ rpm/devtool.conf	15 Jan 2009 02:11:43 -0000	2.259
>  @@ -3,12 +3,13 @@
>   ##
>
>   %common
>  -    MODULE_NAMES="db lua file xar lzma"
>  +    MODULE_NAMES="db lua file xar lzma pcre"
>       MODULE_TAG_DB=""
>       MODULE_TAG_LUA=""
>       MODULE_TAG_FILE=""
>       MODULE_TAG_XAR=""
>       MODULE_TAG_LZMA=""
>  +    MODULE_TAG_PCRE=""
>
>   %checkout
>       for name in $MODULE_NAMES "$@"; do
>  @@ -79,7 +80,7 @@
>           --with-nss=external \
>           --with-gcrypt=external \
>           --with-neon=external \
>  -        --with-pcre=external \
>  +        --with-pcre=internal \
>           --with-uuid=external \
>           --with-xar=internal \
>           --with-bzip2=external \
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/lib/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.187 -r2.188 Makefile.am
>  --- rpm/lib/Makefile.am	15 Sep 2008 08:39:11 -0000	2.187
>  +++ rpm/lib/Makefile.am	15 Jan 2009 02:11:44 -0000	2.188
>  @@ -19,6 +19,7 @@
>   	@WITH_ZLIB_CPPFLAGS@ \
>   	@WITH_LUA_CPPFLAGS@ \
>   	@WITH_FILE_CPPFLAGS@ \
>  +	@WITH_PCRE_CPPFLAGS@ \
>   	@WITH_XAR_CPPFLAGS@
>
>   RPM_LDADD = \
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/misc/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.38 -r1.39 Makefile.am
>  --- rpm/misc/Makefile.am	28 Nov 2008 20:06:45 -0000	1.38
>  +++ rpm/misc/Makefile.am	15 Jan 2009 02:11:44 -0000	1.39
>  @@ -34,6 +34,7 @@
>   	@WITH_LZMA_LDFLAGS@ \
>   	@WITH_LUA_LDFLAGS@ \
>   	@WITH_FILE_LDFLAGS@ \
>  +	@WITH_PCRE_LDFLAGS@ \
>   	@WITH_XAR_LDFLAGS@
>   librpmmisc_la_LIBADD = \
>   	@ALLOCA@ \
>  @@ -42,6 +43,7 @@
>   	@WITH_LZMA_LIBS@ \
>   	@WITH_LUA_LIBS@ \
>   	@WITH_FILE_LIBS@ \
>  +	@WITH_PCRE_LIBS@ \
>   	@WITH_XAR_LIBS@
>   if ENABLE_BUILD_EXTLIBDEP
>   librpmmisc_la_LDFLAGS += $(LDFLAGS)
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/misc/librpmmisc.vers
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.12 -r1.13 librpmmisc.vers
>  --- rpm/misc/librpmmisc.vers	5 Dec 2008 20:57:43 -0000	1.12
>  +++ rpm/misc/librpmmisc.vers	15 Jan 2009 02:11:44 -0000	1.13
>  @@ -69,6 +69,10 @@
>       lzma_code;
>       lzma_end;
>       lzma_preset_lzma;
>  +    lzma_memlimit_alloc;
>  +    lzma_memlimit_create;
>  +    lzma_memlimit_end;
>  +    lzma_memlimit_free;
>       LZMA_STREAM_INIT_VAR;
>       magic_buffer;
>       magic_close;
>  @@ -76,6 +80,10 @@
>       magic_file;
>       magic_load;
>       magic_open;
>  +    pcreposix_regcomp;
>  +    pcreposix_regerror;
>  +    pcreposix_regexec;
>  +    pcreposix_regfree ;
>       xar_add_frombuffer;
>       xar_close;
>       xar_extract_tobuffersz;
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/rpmdb/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.106 -r1.107 Makefile.am
>  --- rpm/rpmdb/Makefile.am	25 Dec 2008 22:24:37 -0000	1.106
>  +++ rpm/rpmdb/Makefile.am	15 Jan 2009 02:11:44 -0000	1.107
>  @@ -19,6 +19,7 @@
>   	@WITH_ZLIB_CPPFLAGS@ \
>   	@WITH_LUA_CPPFLAGS@ \
>   	@WITH_FILE_CPPFLAGS@ \
>  +	@WITH_PCRE_CPPFLAGS@ \
>   	@WITH_XAR_CPPFLAGS@
>
>   EXTRA_DIST = db3.c sqlite.c db_emu.h librpmdb.vers
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/rpmio/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r1.201 -r1.202 Makefile.am
>  --- rpm/rpmio/Makefile.am	10 Jan 2009 17:41:50 -0000	1.201
>  +++ rpm/rpmio/Makefile.am	15 Jan 2009 02:11:45 -0000	1.202
>  @@ -41,6 +41,7 @@
>   	@WITH_ZLIB_CPPFLAGS@ \
>   	@WITH_LUA_CPPFLAGS@ \
>   	@WITH_FILE_CPPFLAGS@ \
>  +	@WITH_PCRE_CPPFLAGS@ \
>   	@WITH_XAR_CPPFLAGS@ \
>   	@WITH_LZMA_CPPFLAGS@
>
>  @@ .
>  patch -p0 <<'@@ .'
>  Index: rpm/tools/Makefile.am
>   
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
>  $ cvs diff -u -r2.115 -r2.116 Makefile.am
>  --- rpm/tools/Makefile.am	10 Jan 2009 17:41:50 -0000	2.115
>  +++ rpm/tools/Makefile.am	15 Jan 2009 02:11:45 -0000	2.116
>  @@ -15,6 +15,7 @@
>   	-I$(top_srcdir)/misc \
>   	-I$(top_srcdir)/build \
>   	@WITH_DB_CPPFLAGS@ \
>  +	@WITH_PCRE_CPPFLAGS@ \
>   	@WITH_XAR_CPPFLAGS@
>
>   EXTRA_DIST =	hashtab.h
>  @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Thu Jan 15 03:42:25 2009
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.