OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2003 12:48:07
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082511480700
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen
Log:
do not build a shared Berkeley-DB and use optimization instead of
warnings in RPM
Summary:
Revision Changes Path
1.4.2.3 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.4.2.5 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.5.2.7 +32 -4 openpkg-src/openpkg/rpm.patch.porting
1.3.2.4 +10 -1 openpkg-src/openpkg/rpm.patch.regen
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.4.2.2 -r1.4.2.3 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 25 Aug 2003 09:57:07 -0000 1.4.2.2
+++ openpkg-src/openpkg/rpm.patch.bugfix 25 Aug 2003 10:48:07 -0000 1.4.2.3
@@ -42,7 +42,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 24 Aug 2003 13:10:21 -0000
++++ configure.ac 25 Aug 2003 10:24:18 -0000
@@ -1274,7 +1275,6 @@
python/rpmdb/Makefile
python/test/Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.4.2.4 -r1.4.2.5 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 25 Aug 2003 09:57:07 -0000 1.4.2.4
+++ openpkg-src/openpkg/rpm.patch.feature 25 Aug 2003 10:48:07 -0000 1.4.2.5
@@ -370,7 +370,7 @@
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 24 Aug 2003 13:10:21 -0000
++++ configure.ac 25 Aug 2003 10:24:18 -0000
@@ -1215,12 +1216,12 @@
[Colon separated paths of macro files to read.])
AC_SUBST(MACROFILES)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.5.2.6 -r1.5.2.7 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 25 Aug 2003 09:57:07 -0000 1.5.2.6
+++ openpkg-src/openpkg/rpm.patch.porting 25 Aug 2003 10:48:07 -0000 1.5.2.7
@@ -14,11 +14,30 @@
##
+---------------------------------------------------------------------------
+| Do not build with warnings on, because we do no RPM development
+| (so warnings are useless here), they cause some confusion inside
+| Berkeley-DB and also slow down building. Instead, increase the
+| optimization level.
++---------------------------------------------------------------------------
+Index: configure.ac
+--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
++++ configure.ac 25 Aug 2003 10:24:18 -0000
+@@ -53,7 +53,7 @@
+ AS=${AS-as}
+ AC_SUBST(AS)
+ if test "$ac_cv_prog_gcc" = yes; then
+- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
++ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
+ fi
+ export CFLAGS
+
+
++---------------------------------------------------------------------------
| Add support for BSD getmntinfo(3).
+---------------------------------------------------------------------------
Index: configure.ac
--- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4
-+++ configure.ac 24 Aug 2003 13:10:21 -0000
++++ configure.ac 25 Aug 2003 10:24:18 -0000
@@ -963,12 +963,13 @@
AC_CHECK_FUNCS(getpassphrase)
@@ -38,12 +57,21 @@
+---------------------------------------------------------------------------
| Not all Bourne-Shells support embedded TAB characters in
| here-document style constructs. Insert the TAB character indirectly
-| to workaround problems.
+| to workaround problems. Additionally, there is no need to build a
+| shared library version of Berkeley-DB.
+---------------------------------------------------------------------------
Index: db3/configure
--- db3/configure 18 Jan 2003 14:04:22 -0000 1.1.1.4
-+++ db3/configure 24 Aug 2003 13:10:21 -0000
-@@ -15,11 +15,11 @@
++++ db3/configure 25 Aug 2003 10:35:39 -0000
+@@ -8,18 +8,18 @@
+ ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e
's%--cache-file=.*$%%'`"
+
+ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
+- --enable-shared --enable-static --enable-rpc \
++ --disable-shared --enable-static --enable-rpc \
+ --with-uniquename=_rpmdb --srcdir=$db_dist
+
+ mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
.PHONY: listobjs\
listobjs:\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.3.2.3 -r1.3.2.4 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 25 Aug 2003 09:57:07 -0000 1.3.2.3
+++ openpkg-src/openpkg/rpm.patch.regen 25 Aug 2003 10:48:07 -0000 1.3.2.4
@@ -37,7 +37,16 @@
+---------------------------------------------------------------------------
Index: configure
--- configure 16 Jul 2003 17:05:55 -0000 1.1.1.23
-+++ configure 24 Aug 2003 18:58:35 -0000
++++ configure 25 Aug 2003 10:24:29 -0000
+@@ -4040,7 +4040,7 @@
+ AS=${AS-as}
+
+ if test "$ac_cv_c_compiler_gnu" = yes; then
+- CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith
-Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts"
++ CFLAGS="$CFLAGS -pipe -O2 -D_GNU_SOURCE -D_REENTRANT"
+ fi
+ export CFLAGS
+
@@ -22911,6 +22911,86 @@
else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
