RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Sep-2010 21:42:37
Branch: HEAD Handle: 2010092719423700
Modified files:
rpm devtool.conf
Log:
- devtool: pull config changes from the rpm-5_3 branch.
Summary:
Revision Changes Path
2.349 +323 -107 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.348 -r2.349 devtool.conf
--- rpm/devtool.conf 27 Sep 2010 17:06:38 -0000 2.348
+++ rpm/devtool.conf 27 Sep 2010 19:42:37 -0000 2.349
@@ -64,6 +64,13 @@
%checkout
%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
@@ -75,6 +82,7 @@
%configure \
--verbose \
--prefix=/usr \
+ --enable-shared \
--with-db=internal \
--with-dbsql=internal \
--with-db-tools-integrated \
@@ -82,24 +90,27 @@
--with-bzip2 \
--with-xz \
--with-file \
+ --with-path-magic=/usr/share/file/magic \
--with-lua=internal \
--with-tcl \
--without-sqlite \
--with-syck=internal \
- --without-readline \
+ --with-readline \
--without-augeas \
--with-beecrypt=internal \
+ --without-java \
--with-openssl \
--with-nss \
--with-gcrypt \
--without-tomcrypt \
--without-tpm \
- --without-expat \
--with-libtasn1 \
--without-pakchois \
--without-gnutls \
--with-neon=internal \
+ --with-expat \
--with-pcre=internal \
+ --enable-utf8 \
--without-uuid \
--with-attr \
--with-acl \
@@ -120,16 +131,15 @@
--with-python \
--with-pythonembed=/usr/lib:/usr/include/python2.6 \
--with-perl \
- --without-perlembed \
+ --with-perlembed=/usr/lib/perl5/CORE \
--without-ruby \
- --without-selinux \
- --without-sepol \
- --without-semanage \
+ --with-selinux \
+ --with-sepol \
+ --with-semanage \
--without-squirrel \
--with-build-extlibdep \
--with-build-maxextlibdep \
--with-valgrind \
- --disable-openmp \
--enable-build-pic \
--enable-build-versionscript \
--enable-build-warnings \
@@ -144,16 +154,19 @@
--prefix=/usr \
--disable-shared \
--with-db=internal \
- --with-db-sql \
+ --with-dbsql=internal \
--with-db-tools-integrated \
--with-zlib=system \
--with-bzip2=no \
- --with-xz=internal \
- --with-file=internal \
+ --with-xz \
+ --with-file \
+ --with-path-magic=/usr/share/file/magic \
--without-augeas \
- --with-beecrypt=system \
- --with-gcrypt=external \
+ --with-beecrypt=internal \
+ --with-gcrypt \
+ --without-tomcrypt \
--with-pcre=internal \
+ --enable-utf8 \
--with-uuid=system \
--with-popt=system \
--with-pthreads=yes \
@@ -161,10 +174,10 @@
--with-js=internal \
--with-lua=internal \
--with-openssl=system \
- --with-neon=external \
+ --with-neon=internal \
--with-syck=internal \
--without-keyutils \
- --with-xar=no \
+ --without-xar \
--without-sqlite \
--without-nss \
--with-selinux=no \
@@ -185,25 +198,31 @@
--verbose \
--prefix=/opt/local \
--with-db=internal \
- --with-db-sql \
+ --with-dbsql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=external \
- --with-file=internal \
+ --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-beecrypt=external \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
- --with-neon=external \
- --with-pcre=external \
- --without-uuid \
+ --with-readline \
+ --with-augeas \
+ --with-beecrypt=internal \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --without-tomcrypt \
+ --without-libtasn1 \
+ --without-pakchois \
+ --without-gnutls \
+ --with-neon \
+ --with-pcre=internal \
+ --enable-utf8 \
+ --with-uuid=/opt/local/lib:/opt/local/include/ossp \
--with-xar=/opt/local/lib:/opt/local/include/xar \
--with-popt=/opt/local \
--without-keyutils \
@@ -211,19 +230,19 @@
--without-libelf \
--with-cudf \
--without-selinux \
- --without-squirrel \
+ --without-squirrel \
--without-ficl \
--without-bash \
+ --without-rc \
--with-installed-readline \
- --with-rc=internal \
- --with-js=/opt/local/gpsee/jsapi \
- --with-gpsee=/opt/local/gpsee \
+ --without-js \
+ --without-gpsee \
--with-python=system \
--with-pythonembed=/usr/lib:/usr/include/python2.6 \
--with-perl \
- --without-perlembed \
+
--with-perlembed=/opt/local/lib/perl5/5.10.1/darwin-multi-2level/CORE \
--with-ruby=/opt/local/lib/ruby/1.8 \
- --without-valgrind \
+ --with-valgrind \
--disable-openmp \
--enable-build-warnings \
--enable-build-debug \
@@ -236,36 +255,41 @@
--verbose \
--prefix=/opt/local \
--with-db=internal \
- --with-db-sql \
+ --with-dbsql=internal \
--with-db-tools-integrated \
- --with-zlib=external \
- --with-bzip2=external \
- --with-xz=internal \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
--with-file=internal \
--with-lua=internal \
- --with-tcl=external \
- --with-sqlite=external \
+ --with-tcl \
+ --without-sqlite \
--with-syck=internal \
--without-augeas \
- --with-beecrypt=external \
- --with-openssl=external \
- --with-nss=external \
- --with-gcrypt=external \
- --with-neon=external \
+ --with-beecrypt=internal \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --without-tomcrypt \
+ --without-libtasn1 \
+ --without-pakchois \
+ --without-gnutls \
+ --with-neon \
--with-pcre=internal \
- --without-uuid \
+ --enable-utf8 \
+ --with-uuid=/opt/local/lib:/opt/local/include/ossp \
--with-xar=/opt/local/lib:/opt/local/include/xar \
- --with-popt=external \
+ --with-popt \
--without-keyutils \
--with-pthreads \
--without-libelf \
--without-selinux \
- --without-squirrel \
+ --without-squirrel \
--without-ficl \
--without-bash \
--without-rc \
- --with-js=/opt/local/gpsee/jsapi \
- --with-gpsee=/opt/local/gpsee \
+ --without-js \
+ --without-gpsee \
--with-python \
--with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \
--with-perl \
@@ -276,6 +300,198 @@
--enable-build-debug \
--enable-maintainer-mode
+# Caixa Magica 14
+%cm14
+ %autogen
+ %configure \
+ --verbose \
+ --prefix=/usr \
+ --with-db=internal \
+ --with-dbsql=internal \
+ --with-db-tools-integrated \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
+ --with-path-magic=/usr/share/file/magic \
+ --with-lua=internal \
+ --with-tcl \
+ --without-sqlite \
+ --with-syck=internal \
+ --with-readline \
+ --with-augeas \
+ --with-beecrypt=internal \
+ --with-openssl \
+ --without-nss \
+ --with-gcrypt \
+ --with-expat \
+ --with-libtasn1 \
+ --with-pakchois \
+ --with-gnutls \
+ --with-neon=internal \
+ --with-pcre=internal \
+ --with-uuid=system \
+ --without-xar \
+ --with-popt \
+ --with-keyutils \
+ --with-pthreads \
+ --with-libelf \
+ --without-cudf \
+ --without-ficl \
+ --without-aterm \
+ --without-nix \
+ --without-bash \
+ --without-rc \
+ --without-js \
+ --without-gpsee \
+ --with-python \
+ --with-pythonembed=/usr/lib:/usr/include/python2.6 \
+ --without-perl \
+ --without-perlembed \
+ --without-ruby \
+ --without-selinux \
+ --without-sepol \
+ --without-semanage \
+ --without-squirrel \
+ --with-build-extlibdep \
+ --with-build-maxextlibdep \
+ --with-valgrind \
+ --enable-build-pic \
+ --enable-build-versionscript \
+ --enable-build-warnings \
+ --enable-build-debug \
+ --enable-maintainer-mode
+
+# ubuntu 10.04 Lucid Lynx
+%ubuntu10
+ %autogen
+ %configure \
+ --verbose \
+ --prefix=/usr \
+ --with-db=internal \
+ --with-dbsql=internal \
+ --with-db-tools-integrated \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
+ --with-path-magic=/usr/share/file/magic \
+ --with-lua=internal \
+ --with-tcl \
+ --without-sqlite \
+ --with-syck=internal \
+ --with-readline \
+ --without-augeas \
+ --with-beecrypt=internal \
+ --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 \
+ --with-keyutils \
+ --with-pthreads \
+ --with-libelf \
+ --without-cudf \
+ --without-ficl \
+ --without-aterm \
+ --without-nix \
+ --without-bash \
+ --without-rc \
+ --without-js \
+ --without-gpsee \
+ --with-python \
+ --with-pythonembed=/usr/lib:/usr/include/python2.6 \
+ --with-perl \
+ --without-perlembed \
+ --without-ruby \
+ --without-selinux \
+ --without-sepol \
+ --without-semanage \
+ --without-squirrel \
+ --with-build-extlibdep \
+ --with-build-maxextlibdep \
+ --with-valgrind \
+ --disable-openmp \
+ --enable-build-pic \
+ --enable-build-versionscript \
+ --enable-build-warnings \
+ --enable-build-debug \
+ --enable-maintainer-mode
+
+# CentOS 5.4
+%centos
+ %autogen
+ %configure \
+ --verbose \
+ --prefix=/usr \
+ --with-db=internal \
+ --with-db-sql=internal \
+ --with-db-tools-integrated \
+ --with-zlib \
+ --with-bzip2 \
+ --with-xz \
+ --with-file \
+ --with-path-magic=/usr/share/file/magic \
+ --with-lua=internal \
+ --with-tcl \
+ --without-sqlite \
+ --with-syck=internal \
+ --without-readline \
+ --without-augeas \
+ --with-beecrypt=internal \
+ --with-openssl \
+ --with-nss \
+ --with-gcrypt \
+ --with-expat \
+ --without-libtasn1 \
+ --without-pakchois \
+ --without-gnutls \
+ --with-neon=internal \
+ --with-pcre=internal \
+ --without-uuid \
+ --with-attr \
+ --with-acl \
+ --without-xar \
+ --with-popt \
+ --with-keyutils \
+ --with-pthreads \
+ --with-libelf \
+ --without-cudf \
+ --without-ficl \
+ --without-aterm \
+ --without-nix \
+ --without-bash \
+ --without-rc \
+ --without-js \
+ --without-gpsee \
+ --without-python \
+ --without-pythonembed \
+ --without-perl \
+ --without-perlembed \
+ --without-ruby \
+ --without-selinux \
+ --without-sepol \
+ --without-semanage \
+ --without-squirrel \
+ --with-build-extlibdep \
+ --with-build-maxextlibdep \
+ --without-valgrind \
+ --enable-openmp \
+ --enable-build-pic \
+ --enable-build-versionscript \
+ --enable-build-warnings \
+ --enable-build-debug \
+ --enable-maintainer-mode
+
# CC=ccache env UMASK=022 distcc cc
# CFLAGS=-O2 -g -m32 -march=pentium-mmx -fasynchronous-unwind-tables
-I/usr/include/python2.5 -I/usr/include/beecrypt
# CXX=ccache env UMASK=022 distcc g++
@@ -285,24 +501,24 @@
%checkout
%autogen
%configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --libdir=/usr/lib \
- --without-selinux \
- --disable-dependency-tracking \
- --with-perl \
- --with-python \
- --with-sqlite \
- --with-pcre \
- --with-bzip2 \
- --with-openssl \
- --with-file \
- --with-libelf \
- --disable-rpath \
- --without-lua
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --libdir=/usr/lib \
+ --without-selinux \
+ --disable-dependency-tracking \
+ --with-perl \
+ --with-python \
+ --with-sqlite \
+ --with-pcre \
+ --with-bzip2 \
+ --with-openssl \
+ --with-file \
+ --with-libelf \
+ --disable-rpath \
+ --without-lua
%fray-cross
%checkout
@@ -355,13 +571,13 @@
--without-selinux \
--without-perl \
--with-python=2.5 \
- --with-zlib=external \
- --with-bzip2=external \
- --with-beecrypt=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-beecrypt \
--without-neon \
--with-file=internal \
- --with-popt=external \
- --with-sqlite=external \
+ --with-popt \
+ --with-sqlite \
--with-dbapi=sqlite \
--with-db=internal \
--with-lua=internal \
@@ -392,13 +608,13 @@
--with-selinux \
--with-perl \
--with-python=2.5 \
- --with-zlib=external \
- --with-bzip2=external \
- --with-beecrypt=external \
+ --with-zlib \
+ --with-bzip2 \
+ --with-beecrypt \
--with-neon \
--with-file=internal \
- --with-popt=external \
- --with-sqlite=external \
+ --with-popt \
+ --with-sqlite \
--with-db=internal \
--with-lua=internal \
--without-apidocs \
@@ -419,31 +635,31 @@
##
## Provision a fedora host sufficiently to build from cvs.
PKGS="\
- perl-devel \
- python-devel \
- uuid-devel \
- libgcrypt-devel \
- beecrypt-devel \
- nss-devel \
- sqlite-devel \
- libxml2-devel \
- neon-devel \
- bzip2-devel \
- zlib-devel \
- pcre-devel \
- keyutils-libs-devel \
- elfutils-libelf-devel \
- gettext-devel \
- popt-devel \
- automake \
- autoconf \
- byacc \
- cvs \
- libtool \
- gcc \
- gettext \
- make \
- pkgconfig \
+ perl-devel \
+ python-devel \
+ uuid-devel \
+ libgcrypt-devel \
+ beecrypt-devel \
+ nss-devel \
+ sqlite-devel \
+ libxml2-devel \
+ neon-devel \
+ bzip2-devel \
+ zlib-devel \
+ pcre-devel \
+ keyutils-libs-devel \
+ elfutils-libelf-devel \
+ gettext-devel \
+ popt-devel \
+ automake \
+ autoconf \
+ byacc \
+ cvs \
+ libtool \
+ gcc \
+ gettext \
+ make \
+ pkgconfig \
"
sudo yum -y install $PKGS
@@ -1278,7 +1494,7 @@
OPTION="$OPTION
--with-db=\"$base3rd/bin/$platform/db-${v_db}/build_unix\""
OPTION="$OPTION --with-xz=\"$base3rd/bin/$platform/xz-${v_xz}\""
OPTION="$OPTION --without-db-rpc"
- OPTION="$OPTION --without-db-sql"
+ OPTION="$OPTION --without-dbsql"
OPTION="$OPTION --without-db-largefile"
OPTION="$OPTION --with-db-tools-integrated"
OPTION="$OPTION --with-db-mutex=\"UNIX/fcntl\""
@@ -1964,7 +2180,7 @@
--with-apidocs \
--with-db=internal \
--with-sqlite=external \
- --with-db-sql \
+ --with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
--with-file=internal \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
