RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 19-Sep-2010 00:03:51
Branch: rpm-5_3 Handle: 2010091822035100
Modified files: (Branch: rpm-5_3)
rpm devtool.conf
Log:
- devtoool: rework stanzas to avoid using --with-foo=external.
(internal neon was confused by --with-libz=/external)
Summary:
Revision Changes Path
2.333.2.21 +91 -85 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.333.2.20 -r2.333.2.21 devtool.conf
--- rpm/devtool.conf 18 Sep 2010 19:47:28 -0000 2.333.2.20
+++ rpm/devtool.conf 18 Sep 2010 22:03:51 -0000 2.333.2.21
@@ -65,6 +65,11 @@
%system
# --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE:/usr/lib/perl5/CORE \
+# --enable-pcregrep-libz \
+# --enable-pcregrep-libbz2 \
+# --enable-pcretest-libreadline \
+# --with-ssl=openssl \
+#
%system
# configure RPM 5 with maximum internal (independence) and maximum
# external (reusability) extend as it usually is the case when
@@ -80,35 +85,36 @@
--with-db=internal \
--with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
- --with-tcl=external \
+ --with-tcl \
--without-sqlite \
--with-syck=internal \
- --without-readline \
+ --with-readline \
--without-augeas \
--with-beecrypt=internal \
--without-java \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
--without-tomcrypt \
- --without-expat \
--without-libtasn1 \
--without-pakchois \
--without-gnutls \
--with-neon=internal \
+ --with-expat \
--with-pcre=internal \
+ --enable-utf8 \
--without-uuid \
--with-attr \
--with-acl \
--without-xar \
- --with-popt=external \
- --with-keyutils=external \
+ --with-popt \
+ --with-keyutils \
--with-pthreads \
--with-libelf \
--without-cudf \
@@ -145,16 +151,16 @@
--prefix=/usr \
--disable-shared \
--with-db=internal \
- --with-db-sql \
+ --with-db-sql=internal \
--with-db-tools-integrated \
--with-zlib=system \
--with-bzip2=no \
- --with-xz=external \
- --with-file=external \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--without-augeas \
--with-beecrypt=internal \
- --with-gcrypt=external \
+ --with-gcrypt \
--with-pcre=internal \
--with-uuid=system \
--with-popt=system \
@@ -187,25 +193,25 @@
--verbose \
--prefix=/opt/local \
--with-db=internal \
+ --with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-db-sql \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
- --with-tcl=external \
- --with-sqlite=external \
+ --with-tcl \
+ --without-sqlite \
--with-syck=internal \
- --with-readline=external \
- --with-augeas=external \
+ --with-readline \
+ --with-augeas \
--with-beecrypt=internal \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
--with-neon=internal \
- --with-pcre=external \
+ --with-pcre=internal \
--without-uuid \
--with-xar=/opt/local/lib:/opt/local/include/xar \
--with-popt=/opt/local \
@@ -239,27 +245,27 @@
--verbose \
--prefix=/opt/local \
--with-db=internal \
- --with-db-sql \
+ --with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
- --with-tcl=external \
- --with-sqlite=external \
+ --with-tcl \
+ --without-sqlite \
--with-syck=internal \
--without-augeas \
--with-beecrypt=internal \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
--with-neon=internal \
--with-pcre=internal \
--without-uuid \
--with-xar=/opt/local/lib:/opt/local/include/xar \
- --with-popt=external \
+ --with-popt \
--without-keyutils \
--with-pthreads \
--without-libelf \
@@ -287,33 +293,33 @@
--verbose \
--prefix=/usr \
--with-db=internal \
- --with-db-sql \
+ --with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
- --with-tcl=external \
- --with-sqlite=external \
+ --with-tcl \
+ --without-sqlite \
--with-syck=internal \
- --with-readline=external \
- --with-augeas=external \
+ --with-readline \
+ --with-augeas \
--with-beecrypt=internal \
- --with-openssl=external \
+ --with-openssl \
--without-nss \
- --with-gcrypt=external \
- --with-expat=external \
- --with-libtasn1=external \
- --with-pakchois=external \
- --with-gnutls=external \
+ --with-gcrypt \
+ --with-expat \
+ --with-libtasn1 \
+ --with-pakchois \
+ --with-gnutls \
--with-neon=internal \
--with-pcre=internal \
--with-uuid=system \
--without-xar \
- --with-popt=external \
- --with-keyutils=external \
+ --with-popt \
+ --with-keyutils \
--with-pthreads \
--with-libelf \
--without-cudf \
@@ -349,35 +355,35 @@
--verbose \
--prefix=/usr \
--with-db=internal \
- --with-db-sql \
+ --with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
--with-tcl \
- --with-sqlite=external \
+ --without-sqlite \
--with-syck=internal \
- --with-readline=external \
+ --with-readline \
--without-augeas \
--with-beecrypt=internal \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
- --with-expat=external \
- --with-libtasn1=external \
- --with-pakchois=external \
- --with-gnutls=external \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --with-expat \
+ --with-libtasn1 \
+ --with-pakchois \
+ --with-gnutls \
--with-neon=internal \
--with-pcre=internal \
--without-uuid \
--with-attr \
--with-acl \
--without-xar \
- --with-popt=external \
- --with-keyutils=external \
+ --with-popt \
+ --with-keyutils \
--with-pthreads \
--with-libelf \
--without-cudf \
@@ -414,24 +420,24 @@
--verbose \
--prefix=/usr \
--with-db=internal \
- --with-db-sql \
+ --with-db-sql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
--with-path-magic=/usr/share/file/magic \
--with-lua=internal \
--with-tcl \
- --with-sqlite=external \
+ --without-sqlite \
--with-syck=internal \
--without-readline \
--without-augeas \
--with-beecrypt=internal \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
- --with-expat=external \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --with-expat \
--without-libtasn1 \
--without-pakchois \
--without-gnutls \
@@ -441,8 +447,8 @@
--with-attr \
--with-acl \
--without-xar \
- --with-popt=external \
- --with-keyutils=external \
+ --with-popt \
+ --with-keyutils \
--with-pthreads \
--with-libelf \
--without-cudf \
@@ .
Received on Sun Sep 19 00:03:52 2010