RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 19-Mar-2011 19:10:22 Branch: rpm-5_2 Handle: 2011031918102200 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: - devtool: backport cm15x build options. Summary: Revision Changes Path 2.293.2.25 +92 -23 rpm/devtool.conf ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.293.2.24 -r2.293.2.25 devtool.conf --- rpm/devtool.conf 4 Nov 2010 12:17:52 -0000 2.293.2.24 +++ rpm/devtool.conf 19 Mar 2011 18:10:22 -0000 2.293.2.25 @@ -114,6 +114,77 @@ --enable-build-debug \ --enable-maintainer-mode +# CentOS 5.x +%centos + %autogen + %configure \ + --verbose \ + --prefix=/usr \ + --enable-shared \ + --with-db=internal \ + --with-dbsql \ + --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 \ + --without-java \ + --with-openssl \ + --with-nss \ + --with-gcrypt \ + --without-tomcrypt \ + --without-tpm \ + --with-libtasn1 \ + --without-pakchois \ + --without-gnutls \ + --with-neon \ + --without-libproxy \ + --with-expat \ + --with-pcre=internal \ + --enable-utf8 \ + --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 \ + --with-gpsee=/usr/lib/rpm \ + --without-python \ + --without-pythonembed \ + --without-perl \ + --without-perlembed \ + --without-ruby \ + --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 \ + --enable-build-debug \ + --enable-maintainer-mode + # Caixa Magica 14 %cm14 %autogen @@ -175,41 +246,40 @@ --enable-build-debug \ --enable-maintainer-mode -# CentOS 5.x -%centos +# Caixa Magica 15x +%cm15x %autogen %configure \ --verbose \ --prefix=/usr \ - --enable-shared \ - --with-db=internal \ + --with-db \ --with-dbsql \ - --with-db-tools-integrated \ + --without-db-tools-integrated \ --with-zlib \ --with-bzip2 \ --with-xz \ --with-file \ - --with-path-magic=/usr/share/file/magic \ + --with-path-magic=/usr/share/misc/magic \ --with-lua=internal \ --with-tcl \ --without-sqlite \ --with-syck=internal \ --with-readline \ - --without-augeas \ - --with-beecrypt=internal \ - --without-java \ + --with-augeas \ + --with-beecrypt \ --with-openssl \ - --with-nss \ + --without-nss \ --with-gcrypt \ --without-tomcrypt \ --without-tpm \ --with-libtasn1 \ - --without-pakchois \ - --without-gnutls \ - --with-neon \ - --without-libproxy \ - --with-expat \ - --with-pcre=internal \ + --with-pakchois \ + --with-gnutls \ + --with-neon=external \ + --without-libroxy \ + --without-expat \ + --with-libxml2 \ + --with-pcre \ --enable-utf8 \ --without-uuid \ --with-attr \ @@ -226,20 +296,19 @@ --without-bash \ --without-rc \ --without-js \ - --with-gpsee=/usr/lib/rpm \ - --without-python \ - --without-pythonembed \ + --without-gpsee \ + --with-python \ + --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --without-perl \ --without-perlembed \ --without-ruby \ - --with-selinux \ - --with-sepol \ - --with-semanage \ + --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 \ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
