[CVS] RPM: rpm/ devtool.conf
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: 30-Aug-2011 14:13:46 Branch: HEAD Handle: 2011083012134600 Modified files: rpm devtool.conf Log: - harwich build options. Summary: RevisionChanges Path 2.381 +11 -12 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.380 -r2.381 devtool.conf --- rpm/devtool.conf 24 May 2011 10:39:12 - 2.380 +++ rpm/devtool.conf 30 Aug 2011 12:13:46 - 2.381 @@ -396,7 +396,8 @@ --with-vendor=fedora \ --enable-maintainer-mode -# CentOS 5.x/x86_64 +# CentOS 5.x/x86_64 = Serento 6.0/x86_64 +# --with-perlembed=/usr/lib64/perl5/5.10.0/x86_64-linux-thread-multi/CORE/:/usr/lib64/perl5/CORE \ %harwich %autogen %configure \ @@ -416,7 +417,7 @@ --without-sqlite \ --with-syck=internal \ --with-readline \ ---without-augeas \ +--with-augeas \ --with-beecrypt=internal \ --without-java \ --with-openssl \ @@ -425,14 +426,14 @@ --without-tomcrypt \ --without-tpm \ --with-libtasn1 \ ---without-pakchois \ ---without-gnutls \ +--with-pakchois \ +--with-gnutls \ --with-neon=internal \ --without-libproxy \ --with-expat \ --with-pcre \ --enable-utf8 \ ---without-uuid \ +--with-uuid=/usr/include:/usr/lib64 \ --with-attr \ --with-acl \ --without-xar \ @@ -449,24 +450,22 @@ --without-js \ --without-gpsee \ --with-python \ ---without-pythonembed \ +--with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ ---without-ruby \ +--with-ruby \ --with-selinux \ ---with-sepol \ ---with-semanage \ +--without-sepol \ +--without-semanage \ --without-squirrel \ --with-build-extlibdep \ --with-build-maxextlibdep \ --with-valgrind \ ---disable-openmp \ +--enable-openmp \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ --enable-build-debug \ ---enable-rpmvercmp-digits-beat-alpha \ ---with-vendor=fedora \ --enable-maintainer-mode # RHEL6x @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 09:39:26
Branch: HEAD Handle: 2011051207392600
Modified files:
rpm devtool.conf
Log:
devtool: macosx: disable openmp (linker issues)
Summary:
RevisionChanges Path
2.379 +2 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.378 -r2.379 devtool.conf
--- rpm/devtool.conf 11 May 2011 15:59:22 - 2.378
+++ rpm/devtool.conf 12 May 2011 07:39:26 - 2.379
@@ -2674,7 +2674,8 @@
--sysconfdir=${prefix}/etc \
--with-path-cfg=${prefix}/etc/rpm \
--enable-broken-chown \
- --disable-rpath
+ --disable-rpath \
+ --disable-openmp
%freebsd
%checkout
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 01-Apr-2011 00:55:04
Branch: HEAD Handle: 2011033122550400
Modified files:
rpm devtool.conf
Log:
sync %cooker target with cooker
Summary:
RevisionChanges Path
2.373 +5 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.372 -r2.373 devtool.conf
--- rpm/devtool.conf 29 Mar 2011 22:16:01 - 2.372
+++ rpm/devtool.conf 31 Mar 2011 22:55:04 - 2.373
@@ -744,6 +744,10 @@
# Mandriva Linux Cooker
%cooker
+export CFLAGS=-O2 -g -frecord-gcc-switches -Wstrict-aliasing=2 -pipe
-Wformat -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4
+export CXXFLAGS=$CFLAGS
+export LDFLAGS=-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-O1
-Wl,--build-id -Wl,--enable-new-dtags
+
%autogen
%configure \
--verbose \
@@ -813,6 +817,7 @@
--enable-build-debug \
--enable-maintainer-mode \
--with-extra-path-macros=/usr/lib/rpm/platform/%{_target}/macros:/usr/lib/rpm/mandriva/platform/%{_target}/macros:/etc/rpm/macros.d/*.macros:/usr/lib/rpm/macros.d/mandriva
+ echo '#define PREMACROFILES /etc/rpm/premacros.d/*.macros' config.h
# FreeBSD 8.1 x86_64
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 26-Mar-2011 16:59:41 Branch: HEAD Handle: 2011032615594100 Modified files: rpm devtool.conf Log: - devtool: +with-uuid for cooker. Summary: RevisionChanges Path 2.371 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.370 -r2.371 devtool.conf --- rpm/devtool.conf 25 Jan 2011 13:36:59 - 2.370 +++ rpm/devtool.conf 26 Mar 2011 15:59:41 - 2.371 @@ -777,7 +777,7 @@ --with-libxml2 \ --with-pcre \ --enable-utf8 \ ---without-uuid \ +--with-uuid \ --with-attr \ --with-acl \ --without-xar \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 25-Jan-2011 14:37:01 Branch: HEAD Handle: 2011012513365900 Modified files: rpm devtool.conf Log: use external popt for cooker Summary: RevisionChanges Path 2.370 +1 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.369 -r2.370 devtool.conf --- rpm/devtool.conf 9 Jan 2011 02:16:19 - 2.369 +++ rpm/devtool.conf 25 Jan 2011 13:36:59 - 2.370 @@ -781,7 +781,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt=internal \ +--with-popt=external \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ -807,7 +807,6 @@ --with-valgrind \ --with-cpuinfo \ --with-vendor=mandriva \ - --with-path-premacros=/etc/rpm/premacros.d \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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-Dec-2010 18:14:00 Branch: HEAD Handle: 2010122717135900 Modified files: rpm devtool.conf Log: - devtool: use popt external for now. Summary: RevisionChanges Path 2.368 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.367 -r2.368 devtool.conf --- rpm/devtool.conf 24 Dec 2010 14:22:25 - 2.367 +++ rpm/devtool.conf 27 Dec 2010 17:13:59 - 2.368 @@ -116,7 +116,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt \ +--with-popt=external \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 03-Dec-2010 16:09:47 Branch: HEAD Handle: 2010120315094700 Modified files: rpm devtool.conf Log: - devtool: sync with rpm-5.3.6. Summary: RevisionChanges Path 2.364 +329 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.363 -r2.364 devtool.conf --- rpm/devtool.conf 2 Nov 2010 16:46:17 - 2.363 +++ rpm/devtool.conf 3 Dec 2010 15:09:47 - 2.364 @@ -464,6 +464,76 @@ --enable-build-debug \ --enable-maintainer-mode +# RHEL6x +%plymouth +%autogen +%configure \ +--verbose \ +--prefix=/usr \ +--enable-shared \ +--with-db \ +--with-dbsql \ +--without-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 \ +--without-libtasn1 \ +--without-pakchois \ +--without-gnutls \ +--with-neon=internal \ +--without-libproxy \ +--with-expat \ +--with-pcre \ +--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 \ +--without-gpsee \ +--with-python \ +--with-pythonembed=/usr/lib:/usr/include/python2.6 \ +--with-perl \ +--without-perlembed \ +--with-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 + # Caixa Magica 14 %cm14 %autogen @@ -602,6 +672,75 @@ --enable-build-debug \ --enable-maintainer-mode +# Mandriva 2011.0 +%mandriva +%autogen +%configure \ +--verbose \ +--prefix=/usr \ +--with-db \ +--with-dbsql \ +--without-db-tools-integrated \ +--with-zlib \ +--with-bzip2 \ +--with-xz \ +--with-file \ +--with-path-magic=/usr/share/misc/magic \ +--with-lua=internal \ +--with-tcl \ +--without-sqlite \ +--with-syck=internal \ +--with-readline \ +--with-augeas \ +--with-beecrypt=internal \ +--with-openssl \ +--with-nss \ +--with-gcrypt \ +--without-tomcrypt \ +--without-tpm \ +--with-libtasn1 \ +--with-pakchois \ +--with-gnutls \ +--with-neon=external \ +--without-libroxy \ +--without-expat \ +--with-libxml2 \ +--with-pcre \ +--enable-utf8 \ +--with-uuid \ +--with-attr \ +--with-acl \ +--without-xar \ +--with-popt=internal \ +--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.7 \ +--with-perl \ + --with-perlembed=/usr/lib64:/usr/lib/perl5/5.12.2/x86_64-linux-thread-multi/CORE/ \ +--with-ruby=/usr/lib64:/usr/lib/ruby/1.8/x86_64-linux/ \ +--without-selinux \ +
[CVS] RPM: rpm/ devtool.conf
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: 03-Dec-2010 18:37:37 Branch: HEAD Handle: 2010120317373700 Modified files: rpm devtool.conf Log: - devtool: sync details with rpm-5.3.6. Summary: RevisionChanges Path 2.365 +17 -15 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.364 -r2.365 devtool.conf --- rpm/devtool.conf 3 Dec 2010 15:09:47 - 2.364 +++ rpm/devtool.conf 3 Dec 2010 17:37:37 - 2.365 @@ -126,15 +126,15 @@ --without-bash \ --without-rc \ --without-js \ ---with-gpsee=/usr/lib/rpm \ +--without-gpsee \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ --with-ruby \ ---with-selinux \ ---with-sepol \ ---with-semanage \ +--without-selinux \ +--without-sepol \ +--without-semanage \ --without-squirrel \ --with-build-extlibdep \ --with-build-maxextlibdep \ @@ -164,7 +164,7 @@ --with-beecrypt=internal \ --with-gcrypt \ --without-tomcrypt \ ---with-pcre \ +--with-pcre=internal \ --enable-utf8 \ --with-uuid=system \ --with-popt=system \ @@ -230,7 +230,7 @@ --without-attr \ --without-acl \ --with-xar=/opt/local/lib:/opt/local/include/xar \ ---with-popt=/opt/local \ +--with-popt=internal \ --without-keyutils \ --with-pthreads \ --without-libelf \ @@ -295,7 +295,7 @@ --without-attr \ --without-acl \ --with-xar=/opt/local/lib:/opt/local/include/xar \ ---with-popt=/opt/local \ +--with-popt=internal \ --without-keyutils \ --with-pthreads \ --without-libelf \ @@ -380,8 +380,8 @@ --without-perlembed \ --with-ruby \ --with-selinux \ ---without-sepol \ ---without-semanage \ +--with-sepol \ +--with-semanage \ --without-squirrel \ --with-build-extlibdep \ --with-build-maxextlibdep \ @@ -433,7 +433,7 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt \ +--with-popt=internal \ --with-keyutils \ --with-pthreads \ --with-libelf \ @@ -445,9 +445,9 @@ --without-rc \ --without-js \ --without-gpsee \ ---without-python \ +--with-python \ --without-pythonembed \ ---without-perl \ +--with-perl \ --without-perlembed \ --without-ruby \ --with-selinux \ @@ -865,7 +865,7 @@ --without-attr \ --without-acl \ --with-xar \ ---with-popt \ +--with-popt=internal \ --without-keyutils \ --with-pthreads \ --without-libelf \ @@ -1037,12 +1037,14 @@ --with-openssl \ --with-nss \ --with-gcrypt \ ---with-expat \ --without-libtasn1 \ --without-pakchois \ --without-gnutls \ --with-neon=internal \ +--without-libproxy \ +--with-expat \ --with-pcre \ +--enable-utf8 \ --without-uuid \ --with-attr \ --with-acl \ @@ -1118,7 +1120,7 @@ --without-attr \ --without-acl \ --without-xar \ ---with-popt \ +--with-popt=external \ --without-keyutils \ --with-pthreads \ --without-libelf \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 02-Nov-2010 17:46:18
Branch: HEAD Handle: 2010110216461700
Modified files:
rpm devtool.conf
Log:
devtool: copy %macosx and %freebsd from 5.3
Summary:
RevisionChanges Path
2.363 +84 -7 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.362 -r2.363 devtool.conf
--- rpm/devtool.conf 2 Nov 2010 15:03:51 - 2.362
+++ rpm/devtool.conf 2 Nov 2010 16:46:17 - 2.363
@@ -2035,7 +2035,78 @@
standalone_testdrive
}
+%macosx
+%checkout
+%macports
+gnumake install DESTDIR=/tmp/rpm-root
+
DYLD_LIBRARY_PATH=/tmp/rpm-root/opt/local/lib:/tmp/rpm-root/opt/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/opt/local/bin/rpm --version
+
+%macports
+ # Ports:
+ # automake
+ # autoconf
+ # libiconv
+ # gettext
+ # db51
+ # sqlite3
+ # popt
+ # beecrypt
+ # expat
+ # neon
+ # zlib
+ # file
+ # xar-devel
+ # liblzma
+ # pcre
+ # ossp-uuid
+ # *lua
+ # python26
+ # perl5.10
+
+ prefix=/opt/local
+ PATH=${prefix}/bin:$PATH
+ %autogen
+ CPPFLAGS=-I${prefix}/include -I${prefix}/include/xar \
+ -I${prefix}/include/ossp -I${prefix}/include/db51
+ LDFLAGS=-L${prefix}/lib -L${prefix}/lib/db51
+ export CPPFLAGS
+ export LDFLAGS
+ __PYTHON=${prefix}/bin/python2.6
+ __PERL=${prefix}/bin/perl5.10
+ export __PYTHON
+ export __PERL
+ %configure \
+ --prefix=${prefix} \
+ --with-libintl-prefix=${prefix} \
+ --with-libiconv-prefix=${prefix} \
+ --mandir=${prefix}/share/man \
+ --infodir=${prefix}/share/info \
+ --with-lua=internal \
+ --without-js \
+ --with-python=`$__PYTHON -c import sys; print
sys.version[:3]` \
+ --with-perl \
+ --with-db \
+ --with-sqlite \
+ --with-popt=external \
+ --with-beecrypt=external \
+ --with-neon=external \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --without-apidocs \
+ --sysconfdir=${prefix}/etc \
+ --with-path-cfg=${prefix}/etc/rpm \
+ --enable-broken-chown \
+ --disable-rpath
+
%freebsd
+%checkout
+%ports
+pkg_add -r gmake bash
+gmake SHELL=`which bash`
+
+%ports
# Ports: (* = internal)
# devel/automake111
# devel/autoconf268
@@ -2045,15 +2116,17 @@
# devel/gettext
# *lang/lua
# *textproc/syck
+ # lang/perl5.10
+ # lang/python26
# databases/db51 SQL=on
# databases/sqlite3 EXTENSION=on
# devel/popt = 1.15
- # security/beecrypt
- # www/neon28
+ # security/beecrypt = 4.2.1
+ # www/neon29
# sysutils/file
- # sysutils/xar
- # sysutils/xz
- # sysutils/pcre
+ # archivers/xar
+ # archivers/xz
+ # devel/pcre
# misc/ossp-uuid
%autogen
@@ -2061,8 +2134,9 @@
PREFIX=${LOCALBASE}
sed -i -E -e s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig: \
scripts/Makefile.in
- CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar
- LDFLAGS=-L${LOCALBASE}/lib
+ CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar \
+ -I${LOCALBASE}/include/db51
+ LDFLAGS=-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db51
export CPPFLAGS
export LDFLAGS
%configure \
@@ -2077,6 +2151,9 @@
--with-sqlite \
--with-dbsql \
--with-db-tools-integrated \
+ --with-popt=external \
+ --with-beecrypt=external \
+ --with-neon=external \
--with-zlib=external \
--with-file=external \
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 30-Oct-2010 13:48:20
Branch: HEAD Handle: 2010103011482000
Modified files:
rpm devtool.conf
Log:
devtool: freebsd: stop setting autotools versions
Summary:
RevisionChanges Path
2.357 +0 -2 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.356 -r2.357 devtool.conf
--- rpm/devtool.conf 30 Oct 2010 11:38:48 - 2.356
+++ rpm/devtool.conf 30 Oct 2010 11:48:20 - 2.357
@@ -2554,8 +2554,6 @@
# sysutils/pcre
# misc/ossp-uuid
- AUTOMAKE_VERSION=111
- AUTOCONF_VERSION=263
%autogen
LOCALBASE=/usr/local
PREFIX=${LOCALBASE}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 25-Oct-2010 23:47:23 Branch: HEAD Handle: 2010102521472200 Modified files: rpm devtool.conf Log: - devtool: update the build option sets. Summary: RevisionChanges Path 2.355 +402 -85rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.354 -r2.355 devtool.conf --- rpm/devtool.conf 17 Oct 2010 07:00:01 - 2.354 +++ rpm/devtool.conf 25 Oct 2010 21:47:22 - 2.355 @@ -70,7 +70,6 @@ #--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 @@ -104,7 +103,7 @@ --with-gcrypt \ --without-tomcrypt \ --without-tpm \ ---with-libtasn1 \ +--without-libtasn1 \ --without-pakchois \ --without-gnutls \ --with-neon=internal \ @@ -128,12 +127,11 @@ --without-rc \ --without-js \ --with-gpsee=/usr/lib/rpm \ ---with-mongo=/usr/lib/rpm \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ ---without-ruby \ +--with-ruby \ --with-selinux \ --with-sepol \ --with-semanage \ @@ -198,14 +196,15 @@ %configure \ --verbose \ --prefix=/opt/local \ ---with-db=internal \ ---with-dbsql=internal \ ---with-db-tools-integrated \ +--enable-shared \ +--with-db=/opt/local/lib/db51:/opt/local/include \ +--with-dbsql=/opt/local/lib/db51:/opt/local/include \ +--without-db-tools-integrated \ --with-zlib \ --with-bzip2 \ --with-xz \ --with-file \ ---with-path-magic=/usr/share/file/magic \ +--with-path-magic=/opt/local/share/misc/magic \ --with-lua=internal \ --with-tcl \ --without-sqlite \ @@ -213,29 +212,34 @@ --with-readline \ --with-augeas \ --with-beecrypt=internal \ +--without-java \ --with-openssl \ --with-nss \ --with-gcrypt \ --without-tomcrypt \ +--without-tpm \ --without-libtasn1 \ --without-pakchois \ --without-gnutls \ ---with-neon \ +--with-neon=external \ +--without-libproxy \ +--with-expat \ --with-pcre=internal \ --enable-utf8 \ --with-uuid=/opt/local/lib:/opt/local/include/ossp \ +--without-attr \ +--without-acl \ --with-xar=/opt/local/lib:/opt/local/include/xar \ --with-popt=/opt/local \ --without-keyutils \ --with-pthreads \ --without-libelf \ --with-cudf \ ---without-selinux \ ---without-squirrel \ --without-ficl \ +--without-aterm \ +--without-nix \ --without-bash \ --without-rc \ ---with-installed-readline \ --without-js \ --without-gpsee \ --with-python=system \ @@ -243,6 +247,11 @@ --with-perl \ --with-perlembed=/opt/local/lib/perl5/5.10.1/darwin-multi-2level/CORE \ --with-ruby=/opt/local/lib/ruby/1.8 \ +--without-selinux \ +--without-sepol \ +--without-semanage \ +--without-squirrel \ +--with-installed-readline \ --with-valgrind \ --disable-openmp \ --enable-build-warnings \ @@ -255,13 +264,14 @@ %configure \ --verbose \ --prefix=/opt/local \ ---with-db=internal \ ---with-dbsql=internal \ ---with-db-tools-integrated \ +--with-db \ +--with-dbsql \ +--without-db-tools-integrated \ --with-zlib \ --with-bzip2 \ --with-xz \ ---with-file=internal \ +--with-file \ +--with-path-magic=/opt/local/share/misc/magic \ --with-lua=internal \ --with-tcl \ --without-sqlite \ @@ -272,21 +282,27 @@ --with-nss \ --with-gcrypt \
[CVS] RPM: rpm/ devtool.conf
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: 17-Oct-2010 09:00:02 Branch: HEAD Handle: 2010101707000100 Modified files: rpm devtool.conf Log: - devtool: harwich CentOS5/x86_64 configuration (no GPSEE yet). Summary: RevisionChanges Path 2.354 +71 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.353 -r2.354 devtool.conf --- rpm/devtool.conf 16 Oct 2010 23:57:14 - 2.353 +++ rpm/devtool.conf 17 Oct 2010 07:00:01 - 2.354 @@ -499,6 +499,77 @@ --enable-build-debug \ --enable-maintainer-mode +# CentOS 5.x/x86_64 +%harwich +%autogen +%configure \ +--verbose \ +--prefix=/usr \ +--enable-shared \ +--with-db \ +--with-dbsql \ +--without-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=internal \ +--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 \ +--without-gpsee \ +--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 + # 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++ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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 19:06:38 Branch: HEAD Handle: 2010092717063800 Modified files: rpm devtool.conf Log: - re-add changes from rpm-5_3 development. Summary: RevisionChanges Path 2.348 +10 -10 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.347 -r2.348 devtool.conf --- rpm/devtool.conf 17 Sep 2010 18:15:35 - 2.347 +++ rpm/devtool.conf 27 Sep 2010 17:06:38 - 2.348 @@ -78,10 +78,10 @@ --with-db=internal \ --with-dbsql=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-lua=internal \ --with-tcl \ --without-sqlite \ @@ -89,13 +89,13 @@ --without-readline \ --without-augeas \ --with-beecrypt=internal \ ---with-openssl=external \ ---with-nss=external \ ---with-gcrypt=external \ +--with-openssl \ +--with-nss \ +--with-gcrypt \ --without-tomcrypt \ --without-tpm \ --without-expat \ ---with-libtasn1=external \ +--with-libtasn1 \ --without-pakchois \ --without-gnutls \ --with-neon=internal \ @@ -104,8 +104,8 @@ --with-attr \ --with-acl \ --without-xar \ ---with-popt=external \ ---with-keyutils=external \ +--with-popt \ +--with-keyutils \ --with-pthreads \ --with-libelf \ --without-cudf \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: RevisionChanges 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 - 2.348 +++ rpm/devtool.conf 27 Sep 2010 19:42:37 - 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 \
[CVS] RPM: rpm/ devtool.conf
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: 13-Sep-2010 00:26:21 Branch: HEAD Handle: 201009162100 Modified files: rpm devtool.conf Log: - devtool: system: reenable --with-gpsee=/usr/lib/rpm. Summary: RevisionChanges Path 2.346 +3 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.345 -r2.346 devtool.conf --- rpm/devtool.conf 1 Sep 2010 09:01:47 - 2.345 +++ rpm/devtool.conf 12 Sep 2010 22:26:21 - 2.346 @@ -15,6 +15,8 @@ MODULE_TAG_FICL= MODULE_TAG_RC= MODULE_TAG_BASH= # XXX bash is GPLv2 and cannot be bundled w RPM +MODULE_TAG_BEECRYPT= +MODULE_TAG_NEON= %checkout for name in $MODULE_NAMES $@; do @@ -113,7 +115,7 @@ --without-bash \ --without-rc \ --without-js \ ---without-gpsee \ +--with-gpsee=/usr/lib/rpm \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 10:32:08
Branch: HEAD Handle: 2010090108320800
Modified files:
rpm devtool.conf
Log:
devtool: copy %freebsd from rpm-5_3
Summary:
RevisionChanges Path
2.344 +57 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.343 -r2.344 devtool.conf
--- rpm/devtool.conf 28 Aug 2010 16:05:44 - 2.343
+++ rpm/devtool.conf 1 Sep 2010 08:32:08 - 2.344
@@ -2038,6 +2038,63 @@
# test drive (version only, should set up a local dbpath)
DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:/tmp/rpm-root/usr/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/usr/local/bin/rpm --version
+%freebsd
+ # Ports: (* = internal)
+ # devel/automake111
+ # devel/autoconf263
+ # devel/doxygen
+ # graphics/graphviz
+ # converters/libiconv
+ # devel/gettext
+ # *lang/lua
+ # *textproc/syck
+ # *databases/db50 SQL=on
+ # databases/sqlite3 EXTENSION=on
+ # devel/popt = 1.15
+ # security/beecrypt
+ # www/neon28
+ # *sysutils/file
+ # sysutils/xar
+ # sysutils/xz
+ # sysutils/pcre
+ # misc/ossp-uuid
+
+ AUTOMAKE_VERSION=111
+ AUTOCONF_VERSION=263
+ %autogen
+ LOCALBASE=/usr/local
+ PREFIX=${LOCALBASE}
+ sed -i -E -e s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig: \
+ scripts/Makefile.in
+ CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar
+ LDFLAGS=-L${LOCALBASE}/lib
+ export CPPFLAGS
+ export LDFLAGS
+ %configure \
+ --with-lua=internal \
+ --with-syck=internal \
+ --without-js \
+ --without-gpsee \
+ --with-perl \
+ --with-python \
+ --with-apidocs \
+ --with-db=internal \
+ --with-sqlite=external \
+ --with-db-sql \
+ --with-db-tools-integrated \
+ --with-zlib=external \
+ --with-file=internal \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --sysconfdir=${PREFIX}/etc \
+ --with-path-cfg=${PREFIX}/etc/rpm \
+ --prefix=${PREFIX} \
+ --mandir=${PREFIX}/man \
+ --infodir=${PREFIX}/info \
+ --disable-openmp
+
%prepare
%checkout
%autogen
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 11:01:47
Branch: HEAD Handle: 2010090109014700
Modified files:
rpm devtool.conf
Log:
devtool: rip out %tiger universal
Summary:
RevisionChanges Path
2.345 +12 -131rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.344 -r2.345 devtool.conf
--- rpm/devtool.conf 1 Sep 2010 08:32:08 - 2.344
+++ rpm/devtool.conf 1 Sep 2010 09:01:47 - 2.345
@@ -1350,74 +1350,16 @@
standalone_testdrive
}
-%afb
-%tiger
-
-%panther
-MACOSX_DEPLOYMENT_TARGET=10.3
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-UNIVERSAL_CPP=gcc-3.3 -E
-UNIVERSAL_CC=gcc-3.3; export
PATH=$PATH:/usr/libexec/gcc/darwin/ppc/3.3 # horrible Intel workaround
-UNIVERSAL_CXX=g++-3.3
-UNIVERSAL_CPPFLAGS=-I${UNIVERSAL_SDK}/usr/include
-UNIVERSAL_CFLAGS=-isystem ${UNIVERSAL_SDK}/usr/include -isystem
${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc
-UNIVERSAL_LDFLAGS=-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc
-UNIVERSAL_TARGET=--host powerpc-apple-darwin7 --target
powerpc-apple-darwin7
-platform=Panther
-@source %macosx
-
-%tiger
-MACOSX_DEPLOYMENT_TARGET=10.4
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin8 --target i686-apple-darwin8
-platform=Tiger
-@source %macosx
-
-%leopard
-MACOSX_DEPLOYMENT_TARGET=10.5
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.5.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin9 --target i686-apple-darwin9
-platform=Leopard
-@source %macosx
-
%darwin
%macosx
%macosx
##
-## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms.
-## (this target is heavilly inspired by the OpenPKG standalone target)
-##
-## Written by Anders F Bjorklund in memoriam of the rpm4darwin project
-## which provided the legacy RPM 4.0 to 4.3, for Mac OS X 10.1 to 10.4
-## It can also be used if you want access to the RPM tools or libraries
-## from RPM, without having to install all requirements from MacPorts.
-##
## These tools are built local: m4, autoconf, automake, libtool, gettext
## (the system-provided versions are too old, and thus cannot be
used...)
## Note: libtool is called glibtool on the Darwin platform, due to a
## name conflict with the system linker which is also called libtool(1)
##
-## Shipped programs/libraries are built as Universal Binaries (i.e. fat)
-## with: -isysroot /Developer/SDKs/MacOSX10.x.sdk -arch ppc -arch i386
-## This also requires --disable-dependency-tracking, since it doesn't
-## work with multiple -arch flags (see Apple's Technical Note TN2137)
-##
## These libraries are built internally: db, lua, syck, file, xar, xz
## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
## (building popt statically requires that the required popt.h header
@@ -1434,19 +1376,10 @@
#determine some local tools
SHTOOL=`cd ${DEVTOOL_SRCDIR} pwd`/devtool.shtool
-if [ .$UNIVERSAL_SDK != . ]; then
-if [ ! -d $UNIVERSAL_SDK ]; then
-echo devtool:ERROR: sorry, \$UNIVERSAL_SDK\ is missing 12
-exit 1
-fi
-fi
-test .$UNIVERSAL_CPP == . UNIVERSAL_CPP=gcc -E
-test .$UNIVERSAL_CC == . UNIVERSAL_CC=gcc
-test .$UNIVERSAL_CXX == . UNIVERSAL_CXX=g++
# third-party base directory
basemac=${DEVTOOL_SRCDIR}/../mac
-test .$platform == . platform=MacOSX # needs subdir
+platform=MacOSX # needs subdir
# prepare build environment
[CVS] RPM: rpm/ devtool.conf
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: 28-Aug-2010 18:05:44 Branch: HEAD Handle: 2010082816054400 Modified files: rpm devtool.conf Log: - devtool: change from --with-db-sql - --with-dbsql (very annoying). Summary: RevisionChanges Path 2.343 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.342 -r2.343 devtool.conf --- rpm/devtool.conf 27 Aug 2010 18:12:16 - 2.342 +++ rpm/devtool.conf 28 Aug 2010 16:05:44 - 2.343 @@ -74,7 +74,7 @@ --verbose \ --prefix=/usr \ --with-db=internal \ ---with-db-sql=internal \ +--with-dbsql=internal \ --with-db-tools-integrated \ --with-zlib=external \ --with-bzip2=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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-Aug-2010 20:12:16 Branch: HEAD Handle: 2010082718121600 Modified files: rpm devtool.conf Log: - adjust to sqlite rearrangements. Summary: RevisionChanges Path 2.342 +4 -4 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.341 -r2.342 devtool.conf --- rpm/devtool.conf 23 Aug 2010 19:44:16 - 2.341 +++ rpm/devtool.conf 27 Aug 2010 18:12:16 - 2.342 @@ -3,7 +3,7 @@ ## %common -MODULE_NAMES=db lua file xar xz pcre syck js/src rc neon beecrypt +MODULE_NAMES=db lua xar pcre syck js/src neon beecrypt MODULE_TAG_DB= MODULE_TAG_LUA= MODULE_TAG_FILE= @@ -74,15 +74,15 @@ --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=internal \ +--with-file=external \ --with-lua=internal \ --with-tcl \ ---with-sqlite=external \ +--without-sqlite \ --with-syck=internal \ --without-readline \ --without-augeas \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf rpm/tests/ref/ .alldigests showrc
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: 01-May-2010 06:48:58 Branch: HEAD Handle: 2010050104485502 Modified files: rpm devtool.conf rpm/tests/ref .alldigests showrc Log: - tests make check on Lucid Lynx. Summary: RevisionChanges Path 2.336 +3 -2 rpm/devtool.conf 1.42+100 -100 rpm/tests/ref/.alldigests 1.27+5 -8 rpm/tests/ref/showrc patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.335 -r2.336 devtool.conf --- rpm/devtool.conf 29 Apr 2010 23:35:13 - 2.335 +++ rpm/devtool.conf 1 May 2010 04:48:55 - 2.336 @@ -81,12 +81,12 @@ --with-xz=internal \ --with-file=internal \ --with-lua=internal \ ---with-tcl=external \ +--with-tcl \ --with-sqlite=external \ --with-syck=internal \ --with-readline=external \ --without-augeas \ ---with-beecrypt=internal \ +--with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ --with-gcrypt=external \ @@ -124,6 +124,7 @@ --with-build-extlibdep \ --with-build-maxextlibdep \ --with-valgrind \ +--disable-openmp \ --enable-build-pic \ --enable-build-versionscript \ --enable-build-warnings \ @@ . patch -p0 '@@ .' Index: rpm/tests/ref/.alldigests $ cvs diff -u -r1.41 -r1.42 .alldigests --- rpm/tests/ref/.alldigests 30 Apr 2010 23:45:39 - 1.41 +++ rpm/tests/ref/.alldigests 1 May 2010 04:48:57 - 1.42 @@ -2998,106 +2998,106 @@ crc64:da589bff7397ec35 ref/rpmdb.sql adler32:845b7f3d ref/rpmdb.sql jlu32:3d227ba4 ref/rpmdb.sql -md2:007f4cb80430b259ebff1f26886ff119 ref/showrc -md4:d869eeaf350ea1f7ee6c4b107c3e8bb5 ref/showrc -md5:2fadc98f766186307d6e1aa581e45725 ref/showrc -sha1:d13f0846a47b0be5b76a1d5cacc3369f87a5a36a ref/showrc -sha224:7cf4ca1d7e1bf21bf1527bde52637b3fb6f23ffd7fa7e2fc5a71a6fb ref/showrc -sha256:ace846cb989b141b4d3b3b8595aee104cd29f94a2da680a179f7ca124cbffde2 ref/showrc -sha384:ec374e8794eaec6ec5c0ca9600466846d91f971cf58a7d98e6a6a2ed3ac57dc7ace0097e3b4792d8dcfae8bd93277a8d ref/showrc -sha512:ef891c8cc02c68a502527188f5a0be5dd35ba1e6cccb8d570fd18328d137b8a0be173020439f2532bd18dbcf4102fa3ac6673e19be27531677c304162661ff8d ref/showrc -skein-224:305ec6cc2863517e9ad569e1177e4471eafdf0417a1c02b36d79febe ref/showrc -skein-256:fd6c13b49a977c83ac77c8fc296936582ab25fb4c8b6dd5f29aeeaabdf5bf6ee ref/showrc -skein-384:5237f7eb170993bcdd44c3f648a47ac72358db023e1ea284d2b0d80d0d3a6341b2c8f7dfe53a5c873db399660abd13ca ref/showrc -skein-512:3247c85411600092c1966b3f3ab677a3e6d69746a1b1ccdf26c20b320089a2dfcd169a53377510407702f27aa2fcfa21f8f40781b3382589665b1377bf9fe0ad ref/showrc -skein-1024:1917857a15595afc636b5c625e9483fdb6731894a7634d086be93fc587dac60143f4a77f98c664b354dc7c806b7edd81dda8540b06aa4c1c053192693c4868d10c23dee57e2365ac8348ea12bde85ce8e28e06d2e190929399b02a0db2d34ca010c67867a8157fa1fe97c422cc827b9e320c9c0847ee442e049d40b1f314 ref/showrc -arirang-224:acc254dca0a9469dbb117449323f760884430322c822bc7be2c55344 ref/showrc -arirang-256:212786ca749d19fc0c95f3bb0c5f9b9ff2ed14d748ba0f06c8a9df5c4a207880 ref/showrc -arirang-384:72f39c3b8bf02862f4254124efc4d53b9fa6cf2902ec1679a63198a6e6b14b2983728f2aab1c3d7dc0ef01c896aa1810 ref/showrc -arirang-512:31114b4247fb04aae3aeb52c1d03c039c3ad6e150ca33763173c6528b0c7d5b3375f57a7fde7aefb46bfd649d8391f1fd840912bb992cfc2f9a6a14660956eaa ref/showrc -blake-224:a7e7ae4cf105b49ecaebc7f7deea7a6d5ea937ec16545bbb12b81600 ref/showrc -blake-256:c6840c96cf51b59d80007783db2478de329ce27261b6cea5938570468adc9cbb ref/showrc -blake-384:234edb288ed78846039c8dcf5f50c98e3ae7fb1dade4b2e5ccb67c654b1c808df1b689b829bd320e7e0a24154cbe897d ref/showrc -blake-512:cd0b511b01f8bec6bb987cd16bd90a8e9fdbee869b8032aae246af4342ba3bb4a22860128f37f47575ff44542127922f892698f6bb78eb1d8e97a272db710896 ref/showrc -bmw-224:f60eb27a0a9cd926894f92d504e11e595738b241d3c5bbfedb59f9c7 ref/showrc -bmw-256:fa9f7c2a2d63ab9843b076c8f2634e63d80380e01967c6ee263e1995318cd5c1 ref/showrc -bmw-384:cac417f2ff3beaac8d5b2deb112b174727af300bcf5a681cdb8c5ad39f0d1b76a19aa5b2dccfa3fb19f828afdf956852 ref/showrc
[CVS] RPM: rpm/ devtool.conf
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: 21-Mar-2010 01:36:04 Branch: HEAD Handle: 2010032100360300 Modified files: rpm devtool.conf Log: - devtool: remember how I'm currently building RPM. Summary: RevisionChanges Path 2.333 +5 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.332 -r2.333 devtool.conf --- rpm/devtool.conf 18 Jan 2010 04:29:32 - 2.332 +++ rpm/devtool.conf 21 Mar 2010 00:36:03 - 2.333 @@ -70,6 +70,7 @@ # development tools and the third-party libraries to be installed # in system locations. %autogen +export LDFLAGS=-L/usr/lib/nix %configure \ --verbose \ --prefix=/usr \ @@ -104,10 +105,12 @@ --with-libelf \ --with-cudf \ --with-ficl=none \ +--with-aterm=/usr/lib/nix:/usr/include/nix \ +--with-nix=/usr/lib/nix:/usr/include/nix \ --with-bash=internal \ --with-rc=internal \ ---with-js=/usr/local/gpsee/jsapi \ ---with-gpsee=/usr/local/gpsee \ +--without-js \ +--without-gpsee \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 18-Jan-2010 05:26:15 Branch: HEAD Handle: 2010011804261500 Modified files: rpm devtool.conf Log: - eastham: build against gpsee on leopard. Summary: RevisionChanges Path 2.331 +4 -3 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.330 -r2.331 devtool.conf --- rpm/devtool.conf 10 Jan 2010 05:13:25 - 2.330 +++ rpm/devtool.conf 18 Jan 2010 04:26:15 - 2.331 @@ -238,12 +238,12 @@ --without-augeas \ --with-beecrypt=external \ --with-openssl=external \ ---with-nss=none \ +--with-nss=external \ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ --without-uuid \ ---without-xar \ +--with-xar=/opt/local/lib:/opt/local/include/xar \ --with-popt=external \ --without-keyutils \ --with-pthreads \ @@ -253,7 +253,8 @@ --without-ficl \ --without-bash \ --without-rc \ ---with-js=internal \ +--with-js=/opt/local/gpsee/jsapi \ +--with-gpsee=/opt/local/gpsee \ --with-python \ --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 18-Jan-2010 05:29:32 Branch: HEAD Handle: 2010011804293200 Modified files: rpm devtool.conf Log: - falmouth: build against gpsee on snow leopard. Summary: RevisionChanges Path 2.332 +5 -4 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.331 -r2.332 devtool.conf --- rpm/devtool.conf 18 Jan 2010 04:26:15 - 2.331 +++ rpm/devtool.conf 18 Jan 2010 04:29:32 - 2.332 @@ -203,12 +203,13 @@ --without-selinux \ --without-squirrel \ --without-ficl \ ---with-bash=internal \ +--without-bash \ --with-installed-readline \ --with-rc=internal \ ---with-js=internal \ ---with-python \ ---with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ +--with-js=/opt/local/gpsee/jsapi \ +--with-gpsee=/opt/local/gpsee \ +--with-python=system \ +--with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ --without-perlembed \ --with-ruby=/opt/local/lib/ruby/1.8 \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 06-Jan-2010 11:55:06
Branch: HEAD Handle: 2010010610550600
Modified files:
rpm devtool.conf
Log:
macosx: sync beecrypt with standalone
Summary:
RevisionChanges Path
2.328 +1 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.327 -r2.328 devtool.conf
--- rpm/devtool.conf 6 Jan 2010 07:27:49 - 2.327
+++ rpm/devtool.conf 6 Jan 2010 10:55:06 - 2.328
@@ -1681,7 +1681,7 @@
-e '/^CXX = /s;@CXX@;@CC@;g' \
Makefile.in
$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
+-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/ \}/;}' \
configure
( echo 'ac_cv_have_dev_dsp=no'
echo 'ac_cv_have_dev_audio=no'
@@ -1697,8 +1697,6 @@
--without-cplusplus \
--without-java \
--without-python \
---with-cpu=none \
---with-arch=none \
--disable-threads \
--disable-shared
make
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 05-Jan-2010 12:32:42
Branch: HEAD Handle: 2010010511324200
Modified files:
rpm devtool.conf
Log:
standalone: upgrade beecrypt, disable openmp
Summary:
RevisionChanges Path
2.325 +4 -4 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.324 -r2.325 devtool.conf
--- rpm/devtool.conf 3 Jan 2010 22:26:23 - 2.324
+++ rpm/devtool.conf 5 Jan 2010 11:32:42 - 2.325
@@ -524,7 +524,7 @@
v_openssl=0.9.8k
v_expat=2.0.1
v_neon=0.28.4
-v_beecrypt=4.1.2
+v_beecrypt=4.2.1
v_db=4.7.25
v_sqlite=3.6.14.2
v_lua=5.1.4
@@ -976,7 +976,7 @@
-e '/^CXX = /s;@CXX@;@CC@;g' \
Makefile.in
$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
+-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/ \}/;}' \
configure
( echo 'ac_cv_have_dev_dsp=no'
echo 'ac_cv_have_dev_audio=no'
@@ -990,9 +990,8 @@
--without-cplusplus \
--without-java \
--without-python \
---with-cpu=none \
---with-arch=none \
--disable-threads \
+--disable-openmp \
--disable-shared
make
) || exit $?
@@ -1280,6 +1279,7 @@
OPTION=$OPTION --disable-build-lafiles
OPTION=$OPTION --enable-build-warnings
OPTION=$OPTION --enable-build-debug
+OPTION=$OPTION --disable-openmp
OPTION=$OPTION --disable-shared
OPTION=$OPTION --disable-rpath
OPTION=$OPTION --disable-nls
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 05-Jan-2010 12:35:45
Branch: HEAD Handle: 2010010511354400
Modified files:
rpm devtool.conf
rpm/rpmdb Makefile.am
Log:
standalone: build without db_sql, for db 4.7
Summary:
RevisionChanges Path
2.326 +1 -0 rpm/devtool.conf
1.123 +4 -1 rpm/rpmdb/Makefile.am
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.325 -r2.326 devtool.conf
--- rpm/devtool.conf 5 Jan 2010 11:32:42 - 2.325
+++ rpm/devtool.conf 5 Jan 2010 11:35:44 - 2.326
@@ -1265,6 +1265,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-db-largefile
OPTION=$OPTION --with-db-tools-integrated
OPTION=$OPTION --with-db-mutex=\UNIX/fcntl\
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/Makefile.am
$ cvs diff -u -r1.122 -r1.123 Makefile.am
--- rpm/rpmdb/Makefile.am 26 Dec 2009 16:21:58 - 1.122
+++ rpm/rpmdb/Makefile.am 5 Jan 2010 11:35:44 - 1.123
@@ -192,7 +192,10 @@
logio_SOURCES = logio.c logio.h
logio_LDADD = $(mylibs)
-BUILT_SOURCES = tagtbl.c tbdb.c bdb.c bdb.h $(logio_BUILT)
+BUILT_SOURCES = tagtbl.c $(logio_BUILT)
+if WITH_DB_SQL
+BUILT_SOURCES += tbdb.c bdb.c bdb.h
+endif
tjfn_SOURCES = tjfn.c
tjfn_LDADD = $(mylibs)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jan-2010 23:26:23
Branch: HEAD Handle: 2010010322262300
Modified files:
rpm devtool.conf
Log:
%standalone: macros moved to a subdirectory
Summary:
RevisionChanges Path
2.324 +4 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.323 -r2.324 devtool.conf
--- rpm/devtool.conf 2 Jan 2010 23:48:07 - 2.323
+++ rpm/devtool.conf 3 Jan 2010 22:26:23 - 2.324
@@ -1311,9 +1311,10 @@
$prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -e gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -Va || exit $?
-rpmtopdir=`$prefix/bin/rpm --macros=macros --eval %{_topdir}`
# override --macros to avoid ~/.rpmmacros
-$prefix/bin/rpmbuild -vv --macros=macros -ba
${DEVTOOL_SRCDIR}/devtool-test.spec || exit $?
-$prefix/bin/rpmbuild -vv --macros=macros --rebuild
$rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm || exit $?
+macros=macros/macros # override --macros to avoid ~/.rpmmacros
+rpmtopdir=`$prefix/bin/rpm --macros=$macros --eval %{_topdir}`
+$prefix/bin/rpmbuild -vv --macros=$macros -ba
${DEVTOOL_SRCDIR}/devtool-test.spec || exit $?
+$prefix/bin/rpmbuild -vv --macros=$macros --rebuild
$rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm || exit $?
$prefix/bin/rpm -vv -qpil
$rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
rm -f $rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm
$prefix/bin/rpm -vv -iv
$rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 02-Jan-2010 11:06:11
Branch: HEAD Handle: 2010010210061100
Modified files:
rpm devtool.conf
Log:
initdb doesn't exist anymore
Summary:
RevisionChanges Path
2.322 +0 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.321 -r2.322 devtool.conf
--- rpm/devtool.conf 2 Jan 2010 01:19:45 - 2.321
+++ rpm/devtool.conf 2 Jan 2010 10:06:11 - 2.322
@@ -1303,7 +1303,6 @@
# test RPM (trivially only)
standalone_testdrive () {
( set -x
-$prefix/bin/rpm -vv --initdb || exit $?
$prefix/bin/rpm -vv --import
${DEVTOOL_SRCDIR}/pubkeys/JBJ-GPG-KEY || exit $?
$prefix/bin/rpm -vv -qa || exit $?
$prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 03-Jan-2010 00:48:08 Branch: HEAD Handle: 2010010223480700 Modified files: rpm devtool.conf Log: - devtool: sanity. Summary: RevisionChanges Path 2.323 +4 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.322 -r2.323 devtool.conf --- rpm/devtool.conf 2 Jan 2010 10:06:11 - 2.322 +++ rpm/devtool.conf 2 Jan 2010 23:48:07 - 2.323 @@ -139,15 +139,18 @@ --with-bzip2=no \ --with-xz=internal \ --with-file=internal \ +--without-augeas \ --with-beecrypt=system \ +--with-gcrypt=external \ --with-pcre=internal \ +--with-uuid=system \ --with-popt=system \ --with-pthreads=yes \ --with-libelf=yes \ --with-js=internal \ --with-lua=internal \ --with-openssl=system \ ---with-neon \ +--with-neon=external \ --with-syck=internal \ --without-keyutils \ --with-xar=no \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 01-Jan-2010 22:33:00 Branch: HEAD Handle: 201001012133 Modified files: rpm devtool.conf Log: - devtool: sanity. Summary: RevisionChanges Path 2.320 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.319 -r2.320 devtool.conf --- rpm/devtool.conf 31 Dec 2009 23:19:11 - 2.319 +++ rpm/devtool.conf 1 Jan 2010 21:33:00 - 2.320 @@ -96,7 +96,7 @@ --with-neon=external \ --with-pcre=internal \ --with-uuid=system \ ---with-xar=internal \ +--with-xar=/usr/lib:/usr/include/xar \ --with-popt=external \ --with-keyutils=external \ --with-pthreads \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 01-Jan-2010 00:19:11 Branch: HEAD Handle: 2009123123191100 Modified files: rpm devtool.conf Log: - falmouth: sanity. Summary: RevisionChanges Path 2.319 +5 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.318 -r2.319 devtool.conf --- rpm/devtool.conf 31 Dec 2009 18:46:13 - 2.318 +++ rpm/devtool.conf 31 Dec 2009 23:19:11 - 2.319 @@ -178,6 +178,7 @@ --with-tcl=external \ --with-sqlite=external \ --with-syck=internal \ +--with-readline=external \ --with-augeas=external \ --with-beecrypt=external \ --with-openssl=external \ @@ -186,15 +187,17 @@ --with-neon=external \ --with-pcre=external \ --without-uuid \ ---with-xar=external \ +--with-xar=/opt/local/lib:/opt/local/include/xar \ --with-popt=/opt/local \ --without-keyutils \ --with-pthreads \ --without-libelf \ +--with-cudf \ --without-selinux \ --without-squirrel \ --without-ficl \ ---without-bash \ +--with-bash=internal \ +--with-installed-readline \ --with-rc=internal \ --with-js=internal \ --with-python \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 30-Dec-2009 14:25:02 Branch: HEAD Handle: 2009123013250100 Modified files: rpm devtool.conf Log: - falmouth: devtool.conf fiddles. Summary: RevisionChanges Path 2.317 +5 -4 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.316 -r2.317 devtool.conf --- rpm/devtool.conf 28 Dec 2009 16:25:19 - 2.316 +++ rpm/devtool.conf 30 Dec 2009 13:25:01 - 2.317 @@ -179,16 +179,16 @@ --with-tcl=external \ --with-sqlite=external \ --with-syck=internal \ ---without-augeas \ +--with-augeas=external \ --with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ --with-gcrypt=external \ --with-neon=external \ ---with-pcre=internal \ +--with-pcre=external \ --without-uuid \ ---without-xar \ ---with-popt=external \ +--with-xar=external \ +--with-popt=/opt/local \ --without-keyutils \ --with-pthreads \ --without-libelf \ @@ -204,6 +204,7 @@ --without-perlembed \ --with-ruby=/opt/local/lib/ruby/1.8 \ --without-valgrind \ +--disable-openmp \ --enable-build-warnings \ --enable-build-debug \ --enable-maintainer-mode @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 28-Dec-2009 17:25:20 Branch: HEAD Handle: 2009122816251900 Modified files: rpm devtool.conf Log: - rescusitate --enable-build-pie, re-check with --enable-build-gcov. Summary: RevisionChanges Path 2.316 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.315 -r2.316 devtool.conf --- rpm/devtool.conf 27 Dec 2009 13:56:40 - 2.315 +++ rpm/devtool.conf 28 Dec 2009 16:25:19 - 2.316 @@ -118,9 +118,11 @@ --with-build-maxextlibdep \ --with-valgrind \ --enable-build-pic \ +--enable-build-pie \ --enable-build-versionscript \ --enable-build-warnings \ --enable-build-debug \ +--enable-build-gcov \ --enable-maintainer-mode %static @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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-Dec-2009 14:56:40 Branch: HEAD Handle: 2009122713564000 Modified files: rpm devtool.conf Log: - eastham: build configuration for Leopard server. Summary: RevisionChanges Path 2.315 +4 -4 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.314 -r2.315 devtool.conf --- rpm/devtool.conf 26 Dec 2009 18:47:49 - 2.314 +++ rpm/devtool.conf 27 Dec 2009 13:56:40 - 2.315 @@ -191,7 +191,7 @@ --with-pthreads \ --without-libelf \ --without-selinux \ ---without-squirrel \ + --without-squirrel \ --without-ficl \ --without-bash \ --with-rc=internal \ @@ -216,7 +216,7 @@ --with-db-tools-integrated \ --with-zlib=external \ --with-bzip2=external \ ---with-xz=external \ +--with-xz=internal \ --with-file=internal \ --with-lua=internal \ --with-tcl=external \ @@ -236,10 +236,10 @@ --with-pthreads \ --without-libelf \ --without-selinux \ ---without-squirrel \ + --without-squirrel \ --without-ficl \ --without-bash \ ---with-rc=internal \ +--without-rc \ --with-js=internal \ --with-python \ --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 17-Dec-2009 16:12:37 Branch: HEAD Handle: 2009121715123600 Modified files: rpm devtool.conf Log: - save de facto system build configuration. Summary: RevisionChanges Path 2.309 +12 -8 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.308 -r2.309 devtool.conf --- rpm/devtool.conf 6 Dec 2009 23:44:55 - 2.308 +++ rpm/devtool.conf 17 Dec 2009 15:12:36 - 2.309 @@ -83,11 +83,16 @@ --with-tcl=external \ --with-sqlite=external \ --with-syck=internal \ +--with-readline=external \ --with-augeas=external \ --with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ --with-gcrypt=external \ +--with-expat=external \ +--with-libtasn1=external \ +--with-pakchois=external \ +--with-gnutls=external \ --with-neon=external \ --with-pcre=internal \ --with-uuid=system \ @@ -97,16 +102,15 @@ --with-pthreads \ --with-libelf \ --with-selinux \ - --with-squirrel=/usr/lib:/usr/include/squirrel \ - --with-ficl=/usr/lib:/usr/include/ficl \ ---with-bash=internal \ ---with-rc=internal \ - --with-js=internal \ +--with-sepol \ +--with-semanage \ +--with-squirrel=/usr/lib:/usr/include/squirrel \ +--with-ficl=/usr/lib:/usr/include/ficl \ +--with-js=internal \ --with-python \ - --with-pythonembed=/usr/lib:/usr/include/python2.5 \ +--with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ - --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \ - --with-ruby=/usr/lib/ruby/1.8/i386-linux \ +--with-ruby=/usr/lib/ruby/1.8/i386-linux \ --with-build-extlibdep \ --with-build-maxextlibdep \ --with-valgrind \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 18-Dec-2009 01:29:41 Branch: HEAD Handle: 2009121800294100 Modified files: rpm devtool.conf Log: - devtool: create a build config for static linking. Summary: RevisionChanges Path 2.310 +44 -6 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.309 -r2.310 devtool.conf --- rpm/devtool.conf 17 Dec 2009 15:12:36 - 2.309 +++ rpm/devtool.conf 18 Dec 2009 00:29:41 - 2.310 @@ -120,6 +120,44 @@ --enable-build-debug \ --enable-maintainer-mode +%static +# configure RPM 5 for static linking. +%autogen +%configure \ +--verbose \ +--prefix=/usr \ +--disable-shared \ +--with-db=internal \ +--with-db-tools-integrated \ +--with-zlib=system \ +--with-bzip2=no \ +--with-xz=internal \ +--with-file=internal \ +--with-beecrypt=system \ +--with-pcre=internal \ +--with-popt=system \ +--with-pthreads=yes \ +--with-libelf=yes \ +--with-js=internal \ +--with-lua=internal \ +--with-openssl=system \ +--without-neon \ +--with-syck=internal \ +--without-keyutils \ +--with-xar=no \ +--without-sqlite \ +--without-nss \ +--with-selinux=no \ +--with-sepol=no \ +--with-semanage=no \ +--without-ruby \ +--without-perl \ +--without-python \ +--enable-build-static \ +--enable-build-warnings \ +--enable-build-debug \ +--enable-maintainer-mode + # Snow Leopard on MacPro %falmouth %autogen @@ -150,15 +188,15 @@ --with-pthreads \ --without-libelf \ --without-selinux \ - --without-squirrel \ +--without-squirrel \ --without-ficl \ --without-bash \ --with-rc=internal \ --with-js=internal \ --with-python \ - --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ +--with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ - --without-perlembed \ +--without-perlembed \ --with-ruby=/opt/local/lib/ruby/1.8 \ --without-valgrind \ --enable-build-warnings \ @@ -195,15 +233,15 @@ --with-pthreads \ --without-libelf \ --without-selinux \ - --without-squirrel \ +--without-squirrel \ --without-ficl \ --without-bash \ --with-rc=internal \ --with-js=internal \ --with-python \ - --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ +--with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ - --without-perlembed \ +--without-perlembed \ --with-ruby=/opt/local/lib/ruby/1.8 \ --without-valgrind \ --enable-build-warnings \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 06-Dec-2009 17:56:48 Branch: HEAD Handle: 2009120616564800 Modified files: rpm devtool.conf Log: - capture a snow leopard build configuration. Summary: RevisionChanges Path 2.306 +48 -3 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.305 -r2.306 devtool.conf --- rpm/devtool.conf 25 Jun 2009 06:59:12 - 2.305 +++ rpm/devtool.conf 6 Dec 2009 16:56:48 - 2.306 @@ -103,10 +103,10 @@ --with-rc=internal \ --with-js=internal \ --with-python \ ---with-pythonembed=/usr/lib:/usr/include/python2.5 \ + --with-pythonembed=/usr/lib:/usr/include/python2.5 \ --with-perl \ ---with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \ ---with-ruby=/usr/lib/ruby/1.8/i386-linux \ + --with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \ + --with-ruby=/usr/lib/ruby/1.8/i386-linux \ --with-build-extlibdep \ --with-build-maxextlibdep \ --with-valgrind \ @@ -116,6 +116,51 @@ --enable-build-debug \ --enable-maintainer-mode +# Snow Leopard on MacPro +%falmouth +%autogen +%configure \ +--verbose \ +--prefix=/opt/local \ +--with-db=internal \ +--with-db-tools-integrated \ +--with-zlib=external \ +--with-bzip2=external \ +--with-xz=external \ +--with-file=internal \ +--with-lua=internal \ +--with-tcl=external \ +--without-sqlite \ +--with-syck=internal \ +--without-augeas \ +--with-beecrypt=external \ +--with-openssl=external \ +--with-nss=external \ +--with-gcrypt=external \ +--with-neon=external \ +--with-pcre=internal \ +--without-uuid \ +--without-xar \ +--with-popt=external \ +--without-keyutils \ +--with-pthreads \ +--without-libelf \ +--without-selinux \ + --without-squirrel \ + --without-ficl \ +--without-bash \ +--without-rc \ + --with-js=internal \ +--with-python \ +--without-pythonembed \ +--with-perl \ +--without-perlembed \ +--without-ruby \ +--without-valgrind \ +--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++ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 06-Dec-2009 21:21:28 Branch: HEAD Handle: 2009120620212800 Modified files: rpm devtool.conf Log: - add a build configuyration for eastham (Leopard server on dual G5). Summary: RevisionChanges Path 2.307 +48 -3 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.306 -r2.307 devtool.conf --- rpm/devtool.conf 6 Dec 2009 16:56:48 - 2.306 +++ rpm/devtool.conf 6 Dec 2009 20:21:28 - 2.307 @@ -146,11 +146,56 @@ --with-pthreads \ --without-libelf \ --without-selinux \ - --without-squirrel \ - --without-ficl \ +--without-squirrel \ +--without-ficl \ --without-bash \ --without-rc \ - --with-js=internal \ +--with-js=internal \ +--with-python \ +--without-pythonembed \ +--with-perl \ +--without-perlembed \ +--without-ruby \ +--without-valgrind \ +--enable-build-warnings \ +--enable-build-debug \ +--enable-maintainer-mode + +# Leopard Server on dual G5 +%eastham +%autogen +%configure \ +--verbose \ +--prefix=/opt/local \ +--with-db=internal \ +--with-db-tools-integrated \ +--with-zlib=external \ +--with-bzip2=external \ +--with-xz=external \ +--with-file=internal \ +--with-lua=internal \ +--with-tcl=external \ +--without-sqlite \ +--with-syck=internal \ +--without-augeas \ +--with-beecrypt=external \ +--with-openssl=external \ +--with-nss=none \ +--with-gcrypt=external \ +--with-neon=external \ +--with-pcre=internal \ +--without-uuid \ +--without-xar \ +--with-popt=external \ +--without-keyutils \ +--with-pthreads \ +--without-libelf \ +--without-selinux \ +--without-squirrel \ +--without-ficl \ +--without-bash \ +--without-rc \ +--with-js=internal \ --with-python \ --without-pythonembed \ --with-perl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 07-Dec-2009 00:44:56 Branch: HEAD Handle: 2009120623445500 Modified files: rpm devtool.conf Log: - enable additional build cconfiguration for falmouth/eastham. Summary: RevisionChanges Path 2.308 +12 -12 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.307 -r2.308 devtool.conf --- rpm/devtool.conf 6 Dec 2009 20:21:28 - 2.307 +++ rpm/devtool.conf 6 Dec 2009 23:44:55 - 2.308 @@ -130,7 +130,7 @@ --with-file=internal \ --with-lua=internal \ --with-tcl=external \ ---without-sqlite \ +--with-sqlite=external \ --with-syck=internal \ --without-augeas \ --with-beecrypt=external \ @@ -146,16 +146,16 @@ --with-pthreads \ --without-libelf \ --without-selinux \ ---without-squirrel \ + --without-squirrel \ --without-ficl \ --without-bash \ ---without-rc \ +--with-rc=internal \ --with-js=internal \ --with-python \ ---without-pythonembed \ + --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ ---without-perlembed \ ---without-ruby \ + --without-perlembed \ +--with-ruby=/opt/local/lib/ruby/1.8 \ --without-valgrind \ --enable-build-warnings \ --enable-build-debug \ @@ -175,7 +175,7 @@ --with-file=internal \ --with-lua=internal \ --with-tcl=external \ ---without-sqlite \ +--with-sqlite=external \ --with-syck=internal \ --without-augeas \ --with-beecrypt=external \ @@ -191,16 +191,16 @@ --with-pthreads \ --without-libelf \ --without-selinux \ ---without-squirrel \ + --without-squirrel \ --without-ficl \ --without-bash \ ---without-rc \ +--with-rc=internal \ --with-js=internal \ --with-python \ ---without-pythonembed \ + --with-pythonembed=/opt/local/lib:/opt/local/include/python2.5 \ --with-perl \ ---without-perlembed \ ---without-ruby \ + --without-perlembed \ +--with-ruby=/opt/local/lib/ruby/1.8 \ --without-valgrind \ --enable-build-warnings \ --enable-build-debug \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jason Corley Root: /v/rpm/cvs Email: jas...@rpm5.org Module: rpm Date: 20-Jun-2009 15:08:36 Branch: HEAD Handle: 2009062013083600 Modified files: rpm devtool.conf Log: - fix path on perllocal.pod removal - remove manual txar install as it is now installed into ../lib/rpm/bin - fix stripping of binaries to focus on ../lib/rpm/bin instead of ../lib/rpm Summary: RevisionChanges Path 2.303 +2 -8 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.302 -r2.303 devtool.conf --- rpm/devtool.conf 12 Jun 2009 18:34:57 - 2.302 +++ rpm/devtool.conf 20 Jun 2009 13:08:36 - 2.303 @@ -1747,7 +1747,7 @@ rm /tmp/rpm-root/var # remove generated/conflicting perl module files and lists -rm /tmp/rpm-root/System/Library/Perl/*/darwin-thread-multi-2level/perllocal.pod +rm /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/perllocal.pod rm /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/.packlist # move perl/python modules to canonical /Library locations @@ -1841,10 +1841,6 @@ # don't leak private search paths, libraries and arch'es perl -ni -e print unless /^Libs.private/ /tmp/rpm-root/usr/local/lib/pkgconfig/rpm.pc -# copy the internal txar tool over, for testing purposes -cp -p tools/.libs/txar /tmp/rpm-root/usr/local/lib/rpm -strip -S /tmp/rpm-root/usr/local/lib/rpm/txar - # remove xar binaries rm -f /tmp/rpm-root/usr/local/bin/xar rm -f /tmp/rpm-root/usr/local/share/man/man1/xar.1 @@ -1872,9 +1868,7 @@ # strip debugging symbols, and remove libtool files (.la) strip -S /tmp/rpm-root/usr/local/bin/rpm* -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps -strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* +strip -S /tmp/rpm-root/usr/local/lib/rpm/bin/* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib chmod 755 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle strip -S /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 02-May-2009 22:46:26
Branch: HEAD Handle: 2009050220462600
Modified files:
rpm devtool.conf
Log:
- devtool: automate checking out spidermonkey into js/src.
Summary:
RevisionChanges Path
2.293 +3 -2 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.292 -r2.293 devtool.conf
--- rpm/devtool.conf 29 Apr 2009 23:53:32 - 2.292
+++ rpm/devtool.conf 2 May 2009 20:46:26 - 2.293
@@ -3,7 +3,7 @@
##
%common
-MODULE_NAMES=db lua file xar xz pcre syck
+MODULE_NAMES=db lua file xar xz pcre syck js/src
MODULE_TAG_DB=
MODULE_TAG_LUA=
MODULE_TAG_FILE=
@@ -11,10 +11,11 @@
MODULE_TAG_XZ=
MODULE_TAG_PCRE=
MODULE_TAG_SYCK=
+MODULE_TAG_JS_SRC=
%checkout
for name in $MODULE_NAMES $@; do
-release=MODULE_TAG_`echo ${name} | tr '[a-z]' '[A-Z]'`
+release=MODULE_TAG_`echo ${name} | tr '[a-z/]' '[A-Z_]'`
release=`eval echo \\$${release}`
if [ .${release} = . ]; then
if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 15-Apr-2009 13:50:26 Branch: HEAD Handle: 2009041511502600 Modified files: rpm devtool.conf Log: try to fix Jeff's OSSP uuid vs. E2FSUTILS uuid problem with the new 'system' feature of RPM_CHECK_LIB Summary: RevisionChanges Path 2.286 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.285 -r2.286 devtool.conf --- rpm/devtool.conf 13 Apr 2009 16:32:42 - 2.285 +++ rpm/devtool.conf 15 Apr 2009 11:50:26 - 2.286 @@ -85,7 +85,7 @@ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ ---with-uuid=external \ +--with-uuid=system \ --with-xar=internal \ --with-popt=external \ --with-keyutils=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:52:28
Branch: HEAD Handle: 2009041314522700
Modified files:
rpm devtool.conf
Log:
fix now included in pcre patch
Summary:
RevisionChanges Path
2.282 +0 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.281 -r2.282 devtool.conf
--- rpm/devtool.conf 12 Apr 2009 19:42:56 - 2.281
+++ rpm/devtool.conf 13 Apr 2009 14:52:27 - 2.282
@@ -1601,9 +1601,6 @@
gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | gnutar xf -
( cd pcre-${v_pcre}
patch -p0 ../../../src/pcre-${v_pcre}.patch
-$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
-configure
CC=$UNIVERSAL_CC \
CPPFLAGS=$UNIVERSAL_CPPFLAGS \
CFLAGS=-O2 -g $UNIVERSAL_CFLAGS \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 18:05:55 Branch: HEAD Handle: 2009041316055500 Modified files: rpm devtool.conf Log: SQLite no longer knows about --disable-utf8, but instead a --disable-tcl is reasonable to get rid of the TCL warnings under configure-time Summary: RevisionChanges Path 2.284 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.283 -r2.284 devtool.conf --- rpm/devtool.conf 13 Apr 2009 15:53:03 - 2.283 +++ rpm/devtool.conf 13 Apr 2009 16:05:55 - 2.284 @@ -1558,11 +1558,11 @@ CFLAGS=-O2 -g -fno-common $UNIVERSAL_CFLAGS \ LDFLAGS=$UNIVERSAL_LDFLAGS \ ./configure $UNIVERSAL_TARGET \ ---disable-utf8 \ --disable-readline \ --disable-threadsafe \ --disable-debug \ --disable-amalgamation \ +--disable-tcl \ --disable-shared make ) || exit $? @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 08-Apr-2009 21:56:55 Branch: HEAD Handle: 2009040819565500 Modified files: rpm devtool.conf Log: macosx: enable embedded tcl scriptlets Summary: RevisionChanges Path 2.279 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.278 -r2.279 devtool.conf --- rpm/devtool.conf 8 Apr 2009 17:31:55 - 2.278 +++ rpm/devtool.conf 8 Apr 2009 19:56:55 - 2.279 @@ -1686,6 +1686,7 @@ --with-dbapi=db \ --with-bugreport=a...@rpm5.org \ --with-db=internal \ +--with-tcl=external \ --with-lua=internal \ --with-syck=internal \ --with-zlib=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Apr-2009 13:41:20 Branch: HEAD Handle: 2009040311412000 Modified files: rpm devtool.conf Log: uniform whitespace Summary: RevisionChanges Path 2.272 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.271 -r2.272 devtool.conf --- rpm/devtool.conf 1 Apr 2009 19:52:34 - 2.271 +++ rpm/devtool.conf 3 Apr 2009 11:41:20 - 2.272 @@ -77,7 +77,7 @@ --with-file=internal \ --with-lua=internal \ --with-sqlite=external \ - --with-syck=internal \ +--with-syck=internal \ --with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 01-Apr-2009 21:52:34 Branch: HEAD Handle: 2009040119523400 Modified files: rpm devtool.conf Log: - jbj: fix: mention syck as a module to checkout. Summary: RevisionChanges Path 2.271 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.270 -r2.271 devtool.conf --- rpm/devtool.conf 1 Apr 2009 00:07:36 - 2.270 +++ rpm/devtool.conf 1 Apr 2009 19:52:34 - 2.271 @@ -3,7 +3,7 @@ ## %common -MODULE_NAMES=db lua file xar xz pcre +MODULE_NAMES=db lua file xar xz pcre syck MODULE_TAG_DB= MODULE_TAG_LUA= MODULE_TAG_FILE= @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 17-Mar-2009 23:51:37 Branch: HEAD Handle: 2009031722513700 Modified files: rpm devtool.conf Log: - rearrange a stanza. Summary: RevisionChanges Path 2.267 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.266 -r2.267 devtool.conf --- rpm/devtool.conf 13 Mar 2009 15:09:43 - 2.266 +++ rpm/devtool.conf 17 Mar 2009 22:51:37 - 2.267 @@ -71,6 +71,7 @@ --with-db=internal \ --with-db-tools-integrated \ --with-zlib=external \ +--with-bzip2=external \ --with-xz=internal \ --with-file=internal \ --with-lua=internal \ @@ -83,7 +84,6 @@ --with-pcre=internal \ --with-uuid=external \ --with-xar=internal \ ---with-bzip2=external \ --with-popt=external \ --with-keyutils=external \ --with-pthreads \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf rpm.spec.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jason Corley Root: /v/rpm/cvs Email: jas...@rpm5.org Module: rpm Date: 13-Mar-2009 16:09:43 Branch: HEAD Handle: 2009031315094300 Modified files: rpm devtool.conf rpm.spec.in Log: remove duplicate --db-tools-integrated Summary: RevisionChanges Path 2.266 +0 -1 rpm/devtool.conf 2.455 +0 -1 rpm/rpm.spec.in patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.265 -r2.266 devtool.conf --- rpm/devtool.conf 9 Mar 2009 23:09:40 - 2.265 +++ rpm/devtool.conf 13 Mar 2009 15:09:43 - 2.266 @@ -91,7 +91,6 @@ --with-selinux \ --with-python \ --with-perl \ ---with-db-tools-integrated \ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ @@ . patch -p0 '@@ .' Index: rpm/rpm.spec.in $ cvs diff -u -r2.454 -r2.455 rpm.spec.in --- rpm/rpm.spec.in 15 Dec 2008 21:02:51 - 2.454 +++ rpm/rpm.spec.in 13 Mar 2009 15:09:43 - 2.455 @@ -205,7 +205,6 @@ --with-selinux \ $WITH_PYTHON \ $WITH_PERL \ ---with-db-tools-integrated \ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 10-Mar-2009 00:09:40 Branch: HEAD Handle: 2009030923094000 Modified files: rpm devtool.conf Log: replace tarball.lzma with tarball.xz now that xz format is stable Summary: RevisionChanges Path 2.265 +2 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.264 -r2.265 devtool.conf --- rpm/devtool.conf 7 Mar 2009 16:42:58 - 2.264 +++ rpm/devtool.conf 9 Mar 2009 23:09:40 - 2.265 @@ -1874,7 +1874,7 @@ %prepare make dist -%tarball.lzma +%tarball.xz %prepare - make dist-lzma + make dist-xz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 07-Mar-2009 17:42:58 Branch: HEAD Handle: 2009030716425800 Modified files: rpm devtool.conf Log: - jbj: add explicit --with-pthreads. Summary: RevisionChanges Path 2.264 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.263 -r2.264 devtool.conf --- rpm/devtool.conf 6 Mar 2009 19:17:43 - 2.263 +++ rpm/devtool.conf 7 Mar 2009 16:42:58 - 2.264 @@ -86,6 +86,7 @@ --with-bzip2=external \ --with-popt=external \ --with-keyutils=external \ +--with-pthreads \ --with-libelf \ --with-selinux \ --with-python \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 14-Jan-2009 21:48:24 Branch: HEAD Handle: 2009011420482300 Modified files: rpm devtool.conf Log: - jbj: -pie linkage prevents using valgrind on F11. avoid the pain for now. Summary: RevisionChanges Path 2.258 +0 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.257 -r2.258 devtool.conf --- rpm/devtool.conf 5 Jan 2009 09:45:56 - 2.257 +++ rpm/devtool.conf 14 Jan 2009 20:48:23 - 2.258 @@ -93,7 +93,6 @@ --with-build-extlibdep \ --with-build-maxextlibdep \ --enable-build-pic \ ---enable-build-pie \ --enable-build-versionscript \ --enable-build-warnings \ --enable-build-debug \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 05-Jan-2009 10:45:56 Branch: HEAD Handle: 2009010509455600 Modified files: rpm devtool.conf Log: macosx: include new rpm programs, avoid trying to list Summary: RevisionChanges Path 2.257 +1 -6 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.256 -r2.257 devtool.conf --- rpm/devtool.conf 5 Jan 2009 09:27:59 - 2.256 +++ rpm/devtool.conf 5 Jan 2009 09:45:56 - 2.257 @@ -1840,14 +1840,9 @@ rm -f /tmp/rpm-root/usr/local/lib/pkgconfig/lzma.pc # strip debugging symbols, and remove libtool files (.la) -strip -S /tmp/rpm-root/usr/local/bin/rpm -strip -S /tmp/rpm-root/usr/local/bin/rpm2cpio -strip -S /tmp/rpm-root/usr/local/bin/rpmbuild -strip -S /tmp/rpm-root/usr/local/bin/rpmconstant -strip -S /tmp/rpm-root/usr/local/bin/rpmcache +strip -S /tmp/rpm-root/usr/local/bin/rpm* strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps -strip -S /tmp/rpm-root/usr/local/bin/rpmdigest strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib chmod 755 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 15-Dec-2008 21:04:50 Branch: HEAD Handle: 2008121520045000 Modified files: rpm devtool.conf Log: macosx: explicitly enable bzip2 too Summary: RevisionChanges Path 2.255 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.254 -r2.255 devtool.conf --- rpm/devtool.conf 10 Dec 2008 20:22:10 - 2.254 +++ rpm/devtool.conf 15 Dec 2008 20:04:50 - 2.255 @@ -1681,6 +1681,7 @@ --with-db=internal \ --with-lua=internal \ --with-zlib=external \ +--with-bzip2=external \ --with-file=internal \ --with-xar=internal \ --with-lzma=internal \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
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: 10-Dec-2008 21:22:11 Branch: HEAD Handle: 2008121020221000 Modified files: rpm devtool.conf Log: - jbj: add stanza to check --without-lua building. Summary: RevisionChanges Path 2.254 +28 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.253 -r2.254 devtool.conf --- rpm/devtool.conf 2 Dec 2008 12:39:57 - 2.253 +++ rpm/devtool.conf 10 Dec 2008 20:22:10 - 2.254 @@ -99,6 +99,34 @@ --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++ +# CXXFLAGS=-O2 -g -m32 -march=pentium-mmx -fasynchronous-unwind-tables +# --with-path-lib=\/usr/lib/rpm\ +%wildpikachu +%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 + %fray-cross %checkout %autogen @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Dec-2008 13:39:57
Branch: HEAD Handle: 2008120212395700
Modified files:
rpm devtool.conf
Log:
macosx: fix build with sqlite = 3.6.3
Summary:
RevisionChanges Path
2.253 +1 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.252 -r2.253 devtool.conf
--- rpm/devtool.conf 17 Nov 2008 10:16:05 - 2.252
+++ rpm/devtool.conf 2 Dec 2008 12:39:57 - 2.253
@@ -1523,7 +1523,7 @@
patch -p0 ../../../src/sqlite-${v_sqlite}.patch
CC=$UNIVERSAL_CC \
CPPFLAGS=$UNIVERSAL_CPPFLAGS \
-CFLAGS=-O2 -g $UNIVERSAL_CFLAGS \
+CFLAGS=-O2 -g -fno-common $UNIVERSAL_CFLAGS \
LDFLAGS=$UNIVERSAL_LDFLAGS \
./configure $UNIVERSAL_TARGET \
--disable-utf8 \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Nov-2008 11:09:10
Branch: HEAD Handle: 2008111710090900
Modified files:
rpm devtool.conf
Log:
macosx: add expat, as required by lua/local
Summary:
RevisionChanges Path
2.251 +2 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.250 -r2.251 devtool.conf
--- rpm/devtool.conf 8 Nov 2008 15:53:23 - 2.250
+++ rpm/devtool.conf 17 Nov 2008 10:09:09 - 2.251
@@ -1627,6 +1627,8 @@
LIBS=$LIBS -lssl -lcrypto # shameless workaround for Neon
LDFLAGS=$LDFLAGS -L`pwd`/xar/lib/.libs # Xar linking hack
LDFLAGS=$LDFLAGS -L`pwd`/lzma/src/liblzma/.libs # LZMA hack
+CPPFLAGS=$CPPFLAGS -I$basemac/bin/$platform/expat-${v_expat}/lib #
lua
+LDFLAGS=$LDFLAGS -L$basemac/bin/$platform/expat-${v_expat}/.libs #
lua
export CPP
export CC
export CXX
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 17-Nov-2008 11:16:06 Branch: HEAD Handle: 2008111710160500 Modified files: rpm devtool.conf Log: macosx: avoid duplicate sqlite3 in rpmio Summary: RevisionChanges Path 2.252 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.251 -r2.252 devtool.conf --- rpm/devtool.conf 17 Nov 2008 10:09:09 - 2.251 +++ rpm/devtool.conf 17 Nov 2008 10:16:05 - 2.252 @@ -1683,7 +1683,7 @@ # python complains about missing symbols from all over when using librpm*, relink: make -C misc LIBS=-lz -lxml2 -lpcre $LIBS clean all -make -C rpmio LIBS=-lsqlite3 -lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS clean all +make -C rpmio LIBS=-lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS clean all # install into a temporary destroot, instead of to system rm -rf /tmp/rpm-root @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 20-Oct-2008 00:27:40 Branch: HEAD Handle: 2008101922274000 Modified files: rpm devtool.conf Log: macosx: add %darwin alias for puredarwin use Summary: RevisionChanges Path 2.249 +3 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.248 -r2.249 devtool.conf --- rpm/devtool.conf 19 Oct 2008 21:41:50 - 2.248 +++ rpm/devtool.conf 19 Oct 2008 22:27:40 - 2.249 @@ -1159,6 +1159,9 @@ platform=Leopard @source %macosx +%darwin +%macosx + %macosx ## ## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 02-Sep-2008 10:08:51 Branch: HEAD Handle: 2008090208085100 Modified files: rpm devtool.conf Log: step up to latest LibXML 2.7.1 Summary: RevisionChanges Path 2.245 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.244 -r2.245 devtool.conf --- rpm/devtool.conf 31 Aug 2008 08:44:54 - 2.244 +++ rpm/devtool.conf 2 Sep 2008 08:08:51 - 2.245 @@ -304,7 +304,7 @@ v_lua=5.1.4 v_file=4.26 v_popt=1.14 -v_libxml2=2.7.0 +v_libxml2=2.7.1 v_xar=1.5.2 v_pcre=7.7 v_uuid=1.6.2 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 19-Aug-2008 17:04:48 Branch: HEAD Handle: 2008081915044700 Modified files: rpm devtool.conf Log: macosx: update library litter comments Summary: RevisionChanges Path 2.240 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.239 -r2.240 devtool.conf --- rpm/devtool.conf 18 Aug 2008 23:29:27 - 2.239 +++ rpm/devtool.conf 19 Aug 2008 15:04:47 - 2.240 @@ -1104,7 +1104,7 @@ ## This also requires --disable-dependency-tracking, since it doesn't ## work with multiple -arch flags (see Apple's Technical Note TN2137) ## -## These libraries are built internally: db, lua, zlib, file, xar, lzma +## These libraries are being built internally: db, lua, file, xar, lzma ## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid ## (building popt statically requires that the required popt.h header ## is included within the rpm headers, so that it can be found later) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 15-Jun-2008 15:03:38 Branch: HEAD Handle: 2008061513033800 Modified files: rpm devtool.conf Log: macosx: remove lzma binaries Summary: RevisionChanges Path 2.231 +7 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.230 -r2.231 devtool.conf --- rpm/devtool.conf 30 May 2008 19:05:18 - 2.230 +++ rpm/devtool.conf 15 Jun 2008 13:03:38 - 2.231 @@ -1684,6 +1684,13 @@ rm -f /tmp/rpm-root/usr/local/lib/libxar.a rm -f /tmp/rpm-root/usr/local/lib/libxar.la +# remove lzma binaries +rm -f /tmp/rpm-root/usr/local/bin/*lz* +rm -f /tmp/rpm-root/usr/local/share/man/man1/*lz*.1 +rm -f /tmp/rpm-root/usr/local/include/lzma.h +rm -f -r /tmp/rpm-root/usr/local/include/lzma +rm -f /tmp/rpm-root/usr/local/lib/pkgconfig/lzma.pc + # strip debugging symbols, and remove libtool files (.la) strip -S /tmp/rpm-root/usr/local/bin/rpm strip -S /tmp/rpm-root/usr/local/bin/rpm2cpio @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-May-2008 16:21:53
Branch: HEAD Handle: 2008052414215300
Modified files:
rpm devtool.conf
Log:
Errr.. NO: An explicit -d :pserver:[EMAIL PROTECTED]:/cvs is wrong,
because this prevents RPM 5 developers from committing changes in
sub-directories. By just using cvs without -d one gets the right
behaviour: CVS uses the repository which originally was used for
checking out the RPM base directory. For RPM 5 developers this is via
CVS-over-SSH and for others this is CVS-via-pserver. So, remove
this recent change here.
Summary:
RevisionChanges Path
2.227 +8 -8 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.226 -r2.227 devtool.conf
--- rpm/devtool.conf 23 May 2008 20:40:06 - 2.226
+++ rpm/devtool.conf 24 May 2008 14:21:53 - 2.227
@@ -17,19 +17,19 @@
release=`eval echo \\$${release}`
if [ .${release} = . ]; then
if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
-echo === ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs
up HEAD)
-( cd ${DEVTOOL_SRCDIR}/${name} cvs -d :pserver:[EMAIL
PROTECTED]:/cvs -q up -A -P -d )
+echo === ${name} (cvs up HEAD)
+( cd ${DEVTOOL_SRCDIR}/${name} cvs -q up -A -P -d )
else
-echo === ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs
co HEAD)
-( cd ${DEVTOOL_SRCDIR} cvs -d :pserver:[EMAIL
PROTECTED]:/cvs co -A -d ${name} ${name} )
+echo === ${name} (cvs co HEAD)
+( cd ${DEVTOOL_SRCDIR} cvs co -A -d ${name} ${name} )
fi
else
if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
-echo === ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs
up ${release})
-( cd ${DEVTOOL_SRCDIR}/${name} cvs -d :pserver:[EMAIL
PROTECTED]:/cvs -q up -P -d -r${release} )
+echo === ${name} (cvs up ${release})
+( cd ${DEVTOOL_SRCDIR}/${name} cvs -q up -P -d
-r${release} )
else
-echo === ${name} (cvs -d :pserver:[EMAIL PROTECTED]:/cvs
co ${release})
-( cd ${DEVTOOL_SRCDIR} cvs -d :pserver:[EMAIL
PROTECTED]:/cvs co -r${release} -d ${name} ${name} )
+echo === ${name} (cvs co ${release})
+( cd ${DEVTOOL_SRCDIR} cvs co -r${release} -d ${name}
${name} )
fi
fi
echo === ${name}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-May-2008 09:01:18
Branch: HEAD Handle: 2008052007011800
Modified files:
rpm devtool.conf
Log:
enable lzma for %macosx
Summary:
RevisionChanges Path
2.218 +2 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.217 -r2.218 devtool.conf
--- rpm/devtool.conf 15 May 2008 12:03:54 - 2.217
+++ rpm/devtool.conf 20 May 2008 07:01:18 - 2.218
@@ -1095,7 +1095,7 @@
## This also requires --disable-dependency-tracking, since it doesn't
## work with multiple -arch flags (see Apple's Technical Note TN2137)
##
-## These libraries are being built internally: db, lua, zlib, file, xar
+## These libraries are built internally: db, lua, zlib, file, xar, lzma
## These libraries are statically linked: neon, beecrypt, sqlite, popt
## (building popt statically requires that the required popt.h header
## is included within the rpm headers, so that it can be found later)
@@ -1528,6 +1528,7 @@
--with-zlib=internal \
--with-file=internal \
--with-xar=internal \
+--with-lzma=internal \
--with-neon=$basemac/bin/neon-${v_neon} \
--with-beecrypt=$basemac/bin/beecrypt-${v_beecrypt} \
--with-sqlite=$basemac/bin/sqlite-${v_sqlite} \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-May-2008 19:33:02
Branch: HEAD Handle: 2008052017330100
Modified files:
rpm devtool.conf
Log:
standalone: magic installation broken, couldn't build packages
Summary:
RevisionChanges Path
2.221 +4 -2 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.220 -r2.221 devtool.conf
--- rpm/devtool.conf 20 May 2008 13:57:48 - 2.220
+++ rpm/devtool.conf 20 May 2008 17:33:01 - 2.221
@@ -993,8 +993,10 @@
standalone_install () {
rm -rf $prefix
make install
-install -d -m 755 $prefix/share/file/magic
-install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc
$prefix/share/file/magic/
+# install required runtime files for uninstalled third-party library
file (libmagic)
+install -d -m 755 $prefix/share/file
+install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic
$prefix/share/file/
+install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc
$prefix/share/file/
}
# test RPM (trivially only)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 20-May-2008 19:54:55
Branch: HEAD Handle: 2008052017545500
Modified files:
rpm devtool.conf
Log:
check for magic existance, to work with file-4.24
Summary:
RevisionChanges Path
2.222 +2 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.221 -r2.222 devtool.conf
--- rpm/devtool.conf 20 May 2008 17:33:01 - 2.221
+++ rpm/devtool.conf 20 May 2008 17:54:55 - 2.222
@@ -995,7 +995,9 @@
make install
# install required runtime files for uninstalled third-party library
file (libmagic)
install -d -m 755 $prefix/share/file
+if [ -f $base3rd/bin/$platform/file-${v_file}/magic/magic ]; then
install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic
$prefix/share/file/
+fi
install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic.mgc
$prefix/share/file/
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 26-Apr-2008 18:14:15
Branch: HEAD Handle: 2008042616141500
Modified files:
rpm devtool.conf
Log:
ops, sorry, introduced a whitespace which should be not there
Summary:
RevisionChanges Path
2.214 +0 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.213 -r2.214 devtool.conf
--- rpm/devtool.conf 26 Apr 2008 16:12:45 - 2.213
+++ rpm/devtool.conf 26 Apr 2008 16:14:15 - 2.214
@@ -921,7 +921,6 @@
CPPFLAGS=$CPPFLAGS -DRPM_INTEGRITY_FP=\\\$RPM_INTEGRITY_FP\\\
CPPFLAGS=$CPPFLAGS -DRPM_INTEGRITY_MV=\\\$RPM_INTEGRITY_MV\\\
fi
-
LDFLAGS=$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl}
# shameless workaround for Neon/XAR
LDFLAGS=$LDFLAGS
-L$base3rd/bin/$platform/libxml2-${v_libxml2}/.libs # shameless workaround for
XAR
LDFLAGS=$LDFLAGS -L$base3rd/bin/$platform/zlib-${v_zlib}
# shameless workaround for XAR
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 07-Apr-2008 21:33:21
Branch: HEAD Handle: 2008040719332100
Modified files:
rpm devtool.conf
Log:
make POPT 1.14 build also under non-Linux platforms more portably
Summary:
RevisionChanges Path
2.207 +4 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.206 -r2.207 devtool.conf
--- rpm/devtool.conf 6 Apr 2008 17:39:49 - 2.206
+++ rpm/devtool.conf 7 Apr 2008 19:33:21 - 2.207
@@ -771,8 +771,12 @@
$patch -p0 ../../../src/popt-${v_popt}.patch
CC=$cc \
CPPFLAGS=-DOPENPKG \
+GREP=grep \
./configure \
--disable-shared \
+--with-included-gettext \
+--without-libintl-prefix \
+--without-libiconv-prefix \
--disable-nls
make
) || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 07-Apr-2008 23:30:59
Branch: HEAD Handle: 2008040721305800
Modified files:
rpm devtool.conf
Log:
disable libiconv usage in %standalone popt, so it works on darwin
Summary:
RevisionChanges Path
2.208 +1 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.207 -r2.208 devtool.conf
--- rpm/devtool.conf 7 Apr 2008 19:33:21 - 2.207
+++ rpm/devtool.conf 7 Apr 2008 21:30:58 - 2.208
@@ -770,7 +770,7 @@
( cd popt-${v_popt}
$patch -p0 ../../../src/popt-${v_popt}.patch
CC=$cc \
-CPPFLAGS=-DOPENPKG \
+CPPFLAGS=-DOPENPKG -DPOPT_fprintf=fprintf \
GREP=grep \
./configure \
--disable-shared \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Apr-2008 14:08:52
Branch: HEAD Handle: 2008040112085200
Modified files:
rpm devtool.conf
Log:
clear the CFLAGS to allow non-GCC compilers to be used for building
bzip2
Summary:
RevisionChanges Path
2.199 +1 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.198 -r2.199 devtool.conf
--- rpm/devtool.conf 31 Mar 2008 18:55:56 - 2.198
+++ rpm/devtool.conf 1 Apr 2008 12:08:52 - 2.199
@@ -539,7 +539,7 @@
rm -rf bzip2-${v_bzip2}
$gzip -d -c ../../src/bzip2-${v_bzip2}.tar.gz | $tar xf -
( cd bzip2-${v_bzip2}
-make CC=$cc libbz2.a bzip2
+make CC=$cc CFLAGS=-O libbz2.a bzip2
) || exit $?
) || exit $?
fi
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 01-Apr-2008 22:09:18
Branch: HEAD Handle: 2008040120091800
Modified files:
rpm devtool.conf
Log:
activate GCC assembly stuff really only for GCC
Summary:
RevisionChanges Path
2.201 +10 -9 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.200 -r2.201 devtool.conf
--- rpm/devtool.conf 1 Apr 2008 16:54:53 - 2.200
+++ rpm/devtool.conf 1 Apr 2008 20:09:18 - 2.201
@@ -675,15 +675,16 @@
$gzip -d -c ../../src/db-${v_db}.tar.gz | $tar xf -
( cd db-${v_db}
$patch -p0 ../../../src/db-${v_db}.patch
-mutex=no
-case $platform in
-ix86-* ) mutex=x86/gcc-assembly ;;
-ia64-* ) mutex=ia64/gcc-assembly ;;
-sparc*-* ) mutex=Sparc/gcc-assembly ;;
-ppc*-* ) mutex=PPC/gcc-assembly ;;
-alpha*-* ) mutex=ALPHA/gcc-assembly ;;
-*) mutex=UNIX/fcntl ;;
-esac
+mutex=UNIX/fcntl
+if [ .`($cc -v; $cc --version) /dev/null 21 | grep
-i 'gcc'` != . ]; then
+case $platform in
+ix86-* ) mutex=x86/gcc-assembly ;;
+ia64-* ) mutex=ia64/gcc-assembly ;;
+sparc*-* ) mutex=Sparc/gcc-assembly ;;
+ppc*-* ) mutex=PPC/gcc-assembly ;;
+alpha*-* ) mutex=ALPHA/gcc-assembly ;;
+esac
+fi
cd build_unix
CC=$cc \
../dist/configure \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 01-Apr-2008 22:39:57 Branch: HEAD Handle: 2008040120395700 Modified files: rpm devtool.conf Log: allow building Lua with non-GCC compiler Summary: RevisionChanges Path 2.202 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.201 -r2.202 devtool.conf --- rpm/devtool.conf 1 Apr 2008 20:09:18 - 2.201 +++ rpm/devtool.conf 1 Apr 2008 20:39:57 - 2.202 @@ -734,7 +734,7 @@ *-freebsd* ) platform=bsd ;; *-sunos* ) platform=solaris ;; esac -make CC=$cc $platform +make CC=$cc CFLAGS=-O \$(MYCFLAGS) $platform ) || exit $? ) || exit $? fi @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Mar-2008 12:58:46
Branch: HEAD Handle: 2008032911584600
Modified files:
rpm devtool.conf
Log:
adjust to latest SQLite Autoconf world order
Summary:
RevisionChanges Path
2.197 +2 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.196 -r2.197 devtool.conf
--- rpm/devtool.conf 29 Mar 2008 10:46:20 - 2.196
+++ rpm/devtool.conf 29 Mar 2008 11:58:46 - 2.197
@@ -706,12 +706,13 @@
( cd sqlite-${v_sqlite}
$patch -p0 ../../../src/sqlite-${v_sqlite}.patch
CC=$cc \
-CFLAGS=-DNDEBUG=1 \
LIBS=-lm \
./configure \
--disable-utf8 \
--disable-readline \
--disable-threadsafe \
+--disable-debug \
+--disable-amalgamation \
--disable-shared
make
) || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 11-Mar-2008 18:50:29 Branch: HEAD Handle: 2008031117502900 Modified files: rpm devtool.conf Log: step up to Libtool 1.5.26 (next will be 2.2) Summary: RevisionChanges Path 2.190 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.189 -r2.190 devtool.conf --- rpm/devtool.conf 6 Mar 2008 22:35:27 - 2.189 +++ rpm/devtool.conf 11 Mar 2008 17:50:29 - 2.190 @@ -211,7 +211,7 @@ v_m4=1.4.9 v_autoconf=2.61 v_automake=1.10 -v_libtool=1.5.24 +v_libtool=1.5.26 v_gettext=0.17 # third-party library distribution versions @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 11-Mar-2008 20:39:17 Branch: HEAD Handle: 2008031119391700 Modified files: rpm devtool.conf Log: use latest config.* scripts Summary: RevisionChanges Path 2.193 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.192 -r2.193 devtool.conf --- rpm/devtool.conf 11 Mar 2008 19:36:43 - 2.192 +++ rpm/devtool.conf 11 Mar 2008 19:39:17 - 2.193 @@ -230,7 +230,7 @@ v_xar=1.5.2 v_pcre=7.6 v_uuid=1.6.0 -v_config=20080105 +v_config=20080311 # third-party distribution files dist= @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jason Corley
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 29-Feb-2008 21:21:18
Branch: HEAD Handle: 2008022920211800
Modified files:
rpm devtool.conf
Log:
it builds, ship it! inclusion of uuid in %macosx target
fix librpmmisc missing -lpcre
Summary:
RevisionChanges Path
2.188 +24 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.187 -r2.188 devtool.conf
--- rpm/devtool.conf 27 Feb 2008 13:22:53 - 2.187
+++ rpm/devtool.conf 29 Feb 2008 20:21:18 - 2.188
@@ -1420,6 +1420,28 @@
) || exit $?
) || exit $?
fi
+
+# OSSP uuid (uninstalled third-party library)
+if [ ! -d $basemac/bin/uuid-${v_uuid} ]; then
+echo ++ building third-party library uuid-${v_uuid}
+( cd $basemac/bin
+rm -rf uuid-${v_uuid}
+gzip -d -c ../src/uuid-${v_uuid}.tar.gz | gnutar xf -
+( cd uuid-${v_uuid}
+$SHTOOL subst \
+-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
+configure
+CC=$UNIVERSAL_CC \
+CPPFLAGS=$UNIVERSAL_CPPFLAGS \
+CFLAGS=-O2 -g $UNIVERSAL_CFLAGS \
+LDFLAGS=$UNIVERSAL_LDFLAGS \
+GREP=grep \
+./configure $UNIVERSAL_TARGET \
+--disable-shared
+make
+) || exit $?
+) || exit $?
+fi
}
# configure build environment
@@ -1468,6 +1490,7 @@
--with-sqlite=$basemac/bin/sqlite-${v_sqlite} \
--with-popt=$basemac/bin/popt-${v_popt} \
--with-pcre=$basemac/bin/pcre-${v_pcre} \
+--with-uuid=$basemac/bin/uuid-${v_uuid} \
--with-perl \
--with-python \
--with-apidocs=auto \
@@ -1491,7 +1514,7 @@
make -C perl LD=ld -search_paths_first MACOSX_DEPLOYMENT_TARGET=10.3
clean all
# python complains about missing symbols from all over when using
librpm*, relink:
-make -C misc LIBS=-lz -lxml2 $LIBS clean all
+make -C misc LIBS=-lz -lxml2 -lpcre $LIBS clean all
make -C rpmio LIBS=-lsqlite3 -lpopt -lneon -lexpat -lbeecrypt -lxar
-lbz2 $LIBS clean all
# install into a temporary destroot, instead of to system
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 27-Feb-2008 14:22:53 Branch: HEAD Handle: 2008022713225300 Modified files: rpm devtool.conf Log: macosx: create the required etc/rpm/platform file, so platformScore works Summary: RevisionChanges Path 2.187 +11 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.186 -r2.187 devtool.conf --- rpm/devtool.conf 26 Feb 2008 19:34:36 - 2.186 +++ rpm/devtool.conf 27 Feb 2008 13:22:53 - 2.187 @@ -1551,6 +1551,17 @@ mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/fat if [ .$UNIVERSAL_SDK != . ]; then +# setup CVOG platform +cat __EOF__ /tmp/rpm-root/private/etc/rpm/platform +i386-apple-darwin +fat-apple-darwin +noarch-apple-darwin +__EOF__ +# TODO: when installing the Universal Binary PKG on PowerPC instead of Intel, +# replace i386-apple-darwin with ppc-apple-darwin in the postflight. +# also add extra line with x86_64-apple-darwin or ppc64-apple-darwin +# first, if the installation machine is capable of using 64-bit binaries. + # setup architectures for ARCH in ppc i386 ppc64 x86_64; do if [ $ARCH = ppc64 -o $ARCH = x86_64 ]; then BITS=-m64; else BITS=-m32; fi @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 25-Feb-2008 11:05:49 Branch: HEAD Handle: 2008022510054900 Modified files: rpm devtool.conf Log: macosx: rpmcache and rpmdigest moved Summary: RevisionChanges Path 2.185 +2 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.184 -r2.185 devtool.conf --- rpm/devtool.conf 25 Feb 2008 09:46:46 - 2.184 +++ rpm/devtool.conf 25 Feb 2008 10:05:49 - 2.185 @@ -1575,10 +1575,10 @@ strip -S /tmp/rpm-root/usr/local/bin/rpm2cpio strip -S /tmp/rpm-root/usr/local/bin/rpmbuild strip -S /tmp/rpm-root/usr/local/bin/rpmconstant -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcache +strip -S /tmp/rpm-root/usr/local/bin/rpmcache strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdigest +strip -S /tmp/rpm-root/usr/local/bin/rpmdigest strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib chmod 755 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 07-Feb-2008 16:48:58 Branch: HEAD Handle: 2008020715485800 Modified files: rpm devtool.conf Log: make sure to canonicalize away from System as well as Local frameworks Summary: RevisionChanges Path 2.181 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.180 -r2.181 devtool.conf --- rpm/devtool.conf 5 Feb 2008 14:23:08 - 2.180 +++ rpm/devtool.conf 7 Feb 2008 15:48:58 - 2.181 @@ -1501,6 +1501,8 @@ # move perl/python modules to canonical /Library locations python_version=`( grep -a ^WITH_PYTHON_VERSION config.log; echo 'echo $WITH_PYTHON_VERSION' ) | sh` mkdir -p /tmp/rpm-root/Library/Python/$python_version +mv /tmp/rpm-root/System/Library/Frameworks/Python.framework/Versions/* \ + /tmp/rpm-root/Library/Python/ 2/dev/null mv /tmp/rpm-root/Library/Frameworks/Python.framework/Versions/* \ /tmp/rpm-root/Library/Python/ 2/dev/null rm -r /tmp/rpm-root/Library/Frameworks 2/dev/null @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 06-Jan-2008 20:22:47 Branch: HEAD Handle: 2008010619224600 Modified files: rpm devtool.conf Log: macosx: link in missing libs, libz for file and libxml2 for xar Summary: RevisionChanges Path 2.171 +2 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.170 -r2.171 devtool.conf --- rpm/devtool.conf 5 Jan 2008 09:15:03 - 2.170 +++ rpm/devtool.conf 6 Jan 2008 19:22:46 - 2.171 @@ -1455,7 +1455,8 @@ # perl's MakeMaker ignores our -search_paths_first, and links with system libs :-( make -C perl LD=ld -search_paths_first MACOSX_DEPLOYMENT_TARGET=10.3 clean all -# python complains about missing symbols from all over when using librpmio, relink: +# python complains about missing symbols from all over when using librpm*, relink: +make -C misc LIBS=-lz -lxml2 $LIBS clean all make -C rpmio LIBS=-lsqlite3 -lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS clean all # install into a temporary destroot, instead of to system @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 05-Jan-2008 10:15:03 Branch: HEAD Handle: 2008010509150300 Modified files: rpm devtool.conf Log: upgrade to latest GNU config.* stuff; xar patch was also updated but version unfortunately is the same Summary: RevisionChanges Path 2.170 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.169 -r2.170 devtool.conf --- rpm/devtool.conf 4 Jan 2008 10:55:31 - 2.169 +++ rpm/devtool.conf 5 Jan 2008 09:15:03 - 2.170 @@ -227,7 +227,7 @@ v_libxml2=2.6.30 v_xar=1.5.2 v_pcre=7.4 -v_config=20071205 +v_config=20080105 # third-party distribution files dist= @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 04-Jan-2008 11:55:31 Branch: HEAD Handle: 2008010410553100 Modified files: rpm devtool.conf Log: macosx: silly permissions strip issue Summary: RevisionChanges Path 2.169 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.168 -r2.169 devtool.conf --- rpm/devtool.conf 3 Jan 2008 22:29:09 - 2.168 +++ rpm/devtool.conf 4 Jan 2008 10:55:31 - 2.169 @@ -1570,7 +1570,9 @@ strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdigest strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib +chmod 755 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle strip -S /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle +chmod 555 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle strip -S /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.so rm -f /tmp/rpm-root/usr/local/lib/librpm*.la rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 03-Jan-2008 20:28:05 Branch: HEAD Handle: 2008010319280500 Modified files: rpm devtool.conf Log: we need the usual workaround under Solaris also for RPM Summary: RevisionChanges Path 2.165 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.164 -r2.165 devtool.conf --- rpm/devtool.conf 2 Jan 2008 17:33:43 - 2.164 +++ rpm/devtool.conf 3 Jan 2008 19:28:05 - 2.165 @@ -855,6 +855,7 @@ CPPFLAGS= LDFLAGS= LIBS= +GREP=grep if [ .$RPM_VENDOR_OPENPKG != . ]; then CPPFLAGS=$CPPFLAGS -DRPM_VENDOR_OPENPKG RPM_INTEGRITY_FP=`cat scripts/integrity.fp` @@ -873,6 +874,7 @@ export CPPFLAGS export LDFLAGS export LIBS +export GREP OPTION= OPTION=$OPTION --prefix=\$prefix\ OPTION=$OPTION --mandir=\$prefix/man\ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 03-Jan-2008 23:03:48 Branch: HEAD Handle: 2008010322034800 Modified files: rpm devtool.conf Log: macosx: remove libtool libraries from python too Summary: RevisionChanges Path 2.166 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.165 -r2.166 devtool.conf --- rpm/devtool.conf 3 Jan 2008 19:28:05 - 2.165 +++ rpm/devtool.conf 3 Jan 2008 22:03:48 - 2.166 @@ -1563,6 +1563,7 @@ strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib rm -f /tmp/rpm-root/usr/local/lib/librpm*.la +rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la # test drive (version only, should set up a local dbpath) DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:$DYLD_LIBRARY_PATH /tmp/rpm-root/usr/local/bin/rpm --version @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Jan-2008 23:18:08
Branch: HEAD Handle: 2008010322180800
Modified files:
rpm devtool.conf
Log:
macosx: remove more internal junk
Summary:
RevisionChanges Path
2.167 +3 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.166 -r2.167 devtool.conf
--- rpm/devtool.conf 3 Jan 2008 22:03:48 - 2.166
+++ rpm/devtool.conf 3 Jan 2008 22:18:08 - 2.167
@@ -1542,6 +1542,9 @@
# copy required popt.h library header to internal headers
cp -p $basemac/bin/popt-${v_popt}/popt.h
/tmp/rpm-root/usr/local/include/rpm
+# don't leak private search paths, libraries and arch'es
+perl -ni -e print unless /^Libs.private/
/tmp/rpm-root/usr/local/lib/pkgconfig/rpm.pc
+
# copy the internal txar tool over, for testing purposes
cp -p tools/.libs/txar /tmp/rpm-root/usr/local/lib/rpm
strip -S /tmp/rpm-root/usr/local/lib/rpm/txar
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 03-Jan-2008 23:29:09 Branch: HEAD Handle: 2008010322290900 Modified files: rpm devtool.conf Log: macosx: more debugging symbol stripping Summary: RevisionChanges Path 2.168 +7 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.167 -r2.168 devtool.conf --- rpm/devtool.conf 3 Jan 2008 22:18:08 - 2.167 +++ rpm/devtool.conf 3 Jan 2008 22:29:09 - 2.168 @@ -1561,10 +1561,17 @@ # strip debugging symbols, and remove libtool files (.la) strip -S /tmp/rpm-root/usr/local/bin/rpm +strip -S /tmp/rpm-root/usr/local/bin/rpm2cpio strip -S /tmp/rpm-root/usr/local/bin/rpmbuild strip -S /tmp/rpm-root/usr/local/bin/rpmconstant +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcache +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdigest strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib +strip -S /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle +strip -S /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.so rm -f /tmp/rpm-root/usr/local/lib/librpm*.la rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 28-Dec-2007 11:09:36
Branch: HEAD Handle: 2007122810093600
Modified files:
rpm devtool.conf
Log:
hack in universal cpu-os macros for darwin (before it was using i386
on ppc)
Summary:
RevisionChanges Path
2.155 +24 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.154 -r2.155 devtool.conf
--- rpm/devtool.conf 28 Dec 2007 10:03:00 - 2.154
+++ rpm/devtool.conf 28 Dec 2007 10:09:36 - 2.155
@@ -1882,6 +1882,30 @@
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc64
+if [ .$UNIVERSAL_SDK != . ]; then
+# setup architectures
+for ARCH in ppc i386; do
+mkdir -p /tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin
+sed -e s/^%/%/ __EOF__
/tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin/macros
+# Per-platform rpm configuration file.
+
+#==
+# per-platform macros.
+#
+\%_arch $ARCH
+\%_build_arch$ARCH
+\%_vendorapple
+\%_osdarwin
+\%_gnu %{nil}
+\%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
+\%optflags -O2 -g
+
+__EOF__
+done
+perl -pi -e
s/^\%_arch.*/\%_arch\t\t\tfat/g;s/^\%_build_arch.*/\%_build_arch\t\tfat/g \
+/tmp/rpm-root/usr/local/lib/rpm/macros
+fi
+
# copy required popt.h library header to internal headers
cp -p $basemac/bin/popt-${v_popt}/popt.h
/tmp/rpm-root/usr/local/include/rpm
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 28-Dec-2007 13:28:31 Branch: HEAD Handle: 2007122812283100 Modified files: rpm devtool.conf Log: create i386 directory on ppc too Summary: RevisionChanges Path 2.157 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.156 -r2.157 devtool.conf --- rpm/devtool.conf 28 Dec 2007 12:16:12 - 2.156 +++ rpm/devtool.conf 28 Dec 2007 12:28:31 - 2.157 @@ -1878,6 +1878,7 @@ rmdir /tmp/rpm-root/usr/local/src/rpm/RPMS/pentium3 rmdir /tmp/rpm-root/usr/local/src/rpm/RPMS/pentium4 rmdir /tmp/rpm-root/usr/local/src/rpm/RPMS/i486 +mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/i386 mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/x86_64 mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc64 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 28-Dec-2007 18:15:10
Branch: HEAD Handle: 2007122817150900
Modified files:
rpm devtool.conf
Log:
no debugging symbols on darwin, since strip scripts are disabled
Summary:
RevisionChanges Path
2.158 +1 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.157 -r2.158 devtool.conf
--- rpm/devtool.conf 28 Dec 2007 12:28:31 - 2.157
+++ rpm/devtool.conf 28 Dec 2007 17:15:09 - 2.158
@@ -1900,7 +1900,7 @@
\%_osdarwin
\%_gnu %{nil}
\%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
-\%optflags -O2 -g
+\%optflags -O2
__EOF__
done
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 28-Dec-2007 19:47:26
Branch: HEAD Handle: 2007122818472600
Modified files:
rpm devtool.conf
Log:
set doxygen to auto on %macosx, so that build doesn't break if it's
missing
Summary:
RevisionChanges Path
2.159 +1 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.158 -r2.159 devtool.conf
--- rpm/devtool.conf 28 Dec 2007 17:15:09 - 2.158
+++ rpm/devtool.conf 28 Dec 2007 18:47:26 - 2.159
@@ -1791,7 +1791,7 @@
--with-popt=$basemac/bin/popt-${v_popt} \
--with-perl \
--with-python \
---with-apidocs \
+--with-apidocs=auto \
--disable-static \
--enable-shared \
--disable-rpath \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 27-Dec-2007 11:14:36
Branch: HEAD Handle: 2007122710143600
Modified files:
rpm devtool.conf
Log:
%_gnu is now correctly detected by configure
Summary:
RevisionChanges Path
2.151 +0 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.150 -r2.151 devtool.conf
--- rpm/devtool.conf 24 Dec 2007 16:38:09 - 2.150
+++ rpm/devtool.conf 27 Dec 2007 10:14:36 - 2.151
@@ -1860,7 +1860,6 @@
# setup default (undetected) configuration, for Mac OS X
sed -i -e s,${UNIVERSAL_CPP},gcc -E,
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e s,${UNIVERSAL_CC},gcc, /tmp/rpm-root/usr/local/lib/rpm/macros
-sed -i -e 's,-gnu$,%{nil},' /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,libtoolize$,glibtoolize,'
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_usr}/doc,%{_usr}/share/doc,'
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_prefix}/etc,/etc,' /tmp/rpm-root/usr/local/lib/rpm/macros
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jason Corley
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Dec-2007 17:38:09
Branch: HEAD Handle: 2007122416380900
Modified files:
rpm devtool.conf
Log:
more stupid jasonc tricks
Summary:
RevisionChanges Path
2.150 +14 -6 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.149 -r2.150 devtool.conf
--- rpm/devtool.conf 15 Dec 2007 08:56:01 - 2.149
+++ rpm/devtool.conf 24 Dec 2007 16:38:09 - 2.150
@@ -955,6 +955,8 @@
echo ++ establishing third-party area under ($prefix)
rm -rf $prefix/*
+mkdir -p $prefix/spool/repackage/
+mkdir -p $prefix/var/rpm/src/{BUILD,RPMS,SOURCES,SPECS,SRPMS,tmp}
for dir in bin etc src lib; do
if [ ! -d $prefix/$dir ]; then
mkdir $prefix/$dir || exit $?
@@ -1322,12 +1324,18 @@
# do all at once
all () {
-prepare
-standalone_autogen
-configure
-build
-install
-standalone_testdrive
+(
+prepare
+standalone_autogen
+configure
+build
+install
+# there are likely better ways to handle this
+sed -i -e 's,^%_repackage_dir.*,%_repackage_dir
%{_usr}/spool/repackage,' $prefix/lib/rpm/macros
+#
+standalone_testdrive
+make distclean; rm -rf db3/a.out.dSYM/
+) 21 | tee /tmp/devtool_jasonc.log
}
# dispatch command
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 14-Dec-2007 12:14:30
Branch: HEAD Handle: 2007121411143000
Modified files:
rpm devtool.conf
Log:
make sure directory exists, even if the main install failed
Summary:
RevisionChanges Path
2.147 +1 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.146 -r2.147 devtool.conf
--- rpm/devtool.conf 14 Dec 2007 09:34:12 - 2.146
+++ rpm/devtool.conf 14 Dec 2007 11:14:30 - 2.147
@@ -894,6 +894,7 @@
standalone_install () {
rm -rf $prefix
make install
+install -d -m 755 $prefix/lib/rpm
install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic
$prefix/lib/rpm/magic
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jason Corley Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 13-Dec-2007 16:12:18 Branch: HEAD Handle: 2007121315121800 Modified files: rpm devtool.conf Log: fiddle my devtool target, remove perl/python support for now (among other things) Summary: RevisionChanges Path 2.144 +8 -5 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.143 -r2.144 devtool.conf --- rpm/devtool.conf 9 Dec 2007 12:06:42 - 2.143 +++ rpm/devtool.conf 13 Dec 2007 15:12:18 - 2.144 @@ -933,6 +933,8 @@ } %jasonc +%common +%checkout # source reusable companion modules @source %standalone-modules # execute implicit shared modules @@ -1075,12 +1077,16 @@ -e 's;@BUILDCSHARP@;no;g' \ gettext-tools/src/Makefile.in $SHTOOL subst \ --e 's;^\(SUBDIRS =.*\)tests examples;\1;' \ +-e 's;^\(SUBDIRS =.*\)tests gnulib-tests examples;\1;' \ gettext-tools/Makefile.in $SHTOOL subst \ -e 's;\#if USEJEXE;#ifdef USEJEXE;' \ gettext-tools/src/read-java.c \ gettext-tools/src/urlget.c +$SHTOOL subst \ +-e 's;\(#define LIBXML_ICONV_ENABLED\);\1_DUMMY;' \ +gnulib-local/lib/libxml/xmlversion.in.h \ +gettext-tools/gnulib-lib/libxml/xmlversion.in.h CC=$cc \ GREP=$grep \ ./configure \ @@ -1283,16 +1289,13 @@ --with-db=internal \ --with-lua=internal \ --with-file=internal \ +--with-xar=internal \ --with-zlib=internal \ --without-db-rpc \ --with-db-mutex=UNIX/fcntl \ --without-pthreads \ --with-libelf=internal \ --without-selinux \ ---with-perl \ ---with-python=2.3 \ - --with-python-inc-dir=/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3 \ - --with-python-lib-dir=/System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3 \ --without-apidocs \ --disable-build-intlibdep \ --disable-build-extlibdep \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 06-Dec-2007 15:55:22 Branch: HEAD Handle: 2007120614552200 Modified files: rpm devtool.conf Log: allow me to easily build my stock and OpenPKG-specific RPM 5 Summary: RevisionChanges Path 2.142 +3 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.141 -r2.142 devtool.conf --- rpm/devtool.conf 6 Dec 2007 14:47:47 - 2.141 +++ rpm/devtool.conf 6 Dec 2007 14:55:22 - 2.142 @@ -131,6 +131,9 @@ [EMAIL PROTECTED] %rse +%standalone + +%openpkg RPM_VENDOR_OPENPKG=1 export RPM_VENDOR_OPENPKG %standalone @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 05-Dec-2007 09:36:21 Branch: HEAD Handle: 2007120508362100 Modified files: rpm devtool.conf Log: upgrade to latest SQLite and GNU config.* scripts Summary: RevisionChanges Path 2.138 +2 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.137 -r2.138 devtool.conf --- rpm/devtool.conf 5 Dec 2007 03:59:26 - 2.137 +++ rpm/devtool.conf 5 Dec 2007 08:36:21 - 2.138 @@ -215,11 +215,11 @@ v_neon=0.27.2 v_beecrypt=4.1.2 v_db=4.6.21 -v_sqlite=3.5.2 +v_sqlite=3.5.3 v_lua=5.1.2 v_file=4.21 v_popt=1.12 -v_config=20071106 +v_config=20071205 # third-party distribution files dist= @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 23-Nov-2007 00:37:02
Branch: HEAD Handle: 2007112223370200
Modified files:
rpm devtool.conf
Log:
no need to clean xar explicitly anymore
Summary:
RevisionChanges Path
2.133 +0 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.132 -r2.133 devtool.conf
--- rpm/devtool.conf 22 Nov 2007 22:56:17 - 2.132
+++ rpm/devtool.conf 22 Nov 2007 23:37:02 - 2.133
@@ -1666,7 +1666,6 @@
configure () {
echo ++ cleaning up build environment
( cd ${DEVTOOL_SRCDIR}; make distclean || true ) /dev/null 21
-( cd ${DEVTOOL_SRCDIR}/xar; make distclean || true ) /dev/null 21
echo ++ configuring build environment
basemac=`cd $basemac pwd`
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 18-Nov-2007 23:24:29
Branch: HEAD Handle: 2007111822242900
Modified files:
rpm devtool.conf
Log:
install required magic file, so that rpmfcClassify works
Summary:
RevisionChanges Path
2.130 +1 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.129 -r2.130 devtool.conf
--- rpm/devtool.conf 16 Nov 2007 20:33:15 - 2.129
+++ rpm/devtool.conf 18 Nov 2007 22:24:29 - 2.130
@@ -834,6 +834,7 @@
standalone_install () {
rm -rf $prefix
make install
+install -m 644 $base3rd/bin/$platform/file-${v_file}/magic/magic
$prefix/lib/rpm/magic
}
# test RPM (trivially only)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 18-Nov-2007 23:26:32
Branch: HEAD Handle: 2007111822263200
Modified files:
rpm devtool.conf
Log:
convince Darwin libtool(1) that we really, really, really want to use
our static libraries
Summary:
RevisionChanges Path
2.131 +3 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.130 -r2.131 devtool.conf
--- rpm/devtool.conf 18 Nov 2007 22:24:29 - 2.130
+++ rpm/devtool.conf 18 Nov 2007 22:26:32 - 2.131
@@ -777,6 +777,9 @@
if [ .`grep 'OpenPKG RPM' ${DEVTOOL_SRCDIR}/rpmqv.c` != . ]; then
CPPFLAGS=$CPPFLAGS -DOPENPKG
fi
+if [ `uname` = Darwin ]; then
+LDFLAGS=$LDFLAGS -Wl,-search_paths_first
+fi
LDFLAGS=$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl} #
shameless workaround for Neon
LIBS=$LIBS -lssl -lcrypto #
shameless workaround for Neon
LIBS=$LIBS -lm #
shameless workaround for SQLite
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 12-Nov-2007 12:45:09 Branch: HEAD Handle: 2007111211450900 Modified files: rpm devtool.conf Log: some updates from latest platform tests Summary: RevisionChanges Path 2.126 +3 -3 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.125 -r2.126 devtool.conf --- rpm/devtool.conf 11 Nov 2007 16:49:48 - 2.125 +++ rpm/devtool.conf 12 Nov 2007 11:45:09 - 2.126 @@ -163,8 +163,8 @@ ## platforms (each one defined by the combination of hardware ## architecture, operating system and compiler): ## -## o 2007-07-19: ix86-freebsd6.2-gcc4.2.0 -## o 2007-07-19: ix86-freebsd6.2-gcc4.3.0s20070713 +## o 2007-11-11: ix86-freebsd6.2-gcc4.2.2 +## o 2007-11-11: ix86-freebsd6.2-gcc4.3.0s20071109 ## o 2007-07-17: ix86-freebsd6.2-gcc3.4 ## o 2007-07-17: amd64-freebsd6.2-gcc4.1.2 ## o 2007-07-17: ix86-freebsd7.0-gcc4.1.2 @@ -177,7 +177,7 @@ ## o 2007-07-17: ix86-rhel4-gcc4.1.2 ## o 2007-07-17: ix86-solaris9-gcc4.1.2 ## o 2007-07-17: sparc64-solaris8-gcc4.1.2 -## o 2007-07-17: sparc64-solaris9-gcc4.1.2 +## o 2007-11-12: sparc64-solaris9-gcc4.1.2 ## o 2007-07-17: sparc64-solaris10-gcc4.1.2 ## o 2007-07-17: amd64-solaris10-gcc4.1.2 ## o 2007-07-24: ppc-macosx10.4-gcc4.0.1 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
