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: 26-Aug-2003 13:12:28
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082612122700
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec rpm.patch.porting
Log:
ok, build the tools, because RPM insists on this and make sure RPM
does not pick up BeeCrypt's config.h instead of its own
Summary:
Revision Changes Path
1.192.2.20 +1 -1 openpkg-src/openpkg/openpkg.spec
1.5.2.9 +3 -26 openpkg-src/openpkg/rpm.patch.porting
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.19 -r1.192.2.20 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 26 Aug 2003 10:08:09 -0000 1.192.2.19
+++ openpkg-src/openpkg/openpkg.spec 26 Aug 2003 11:12:27 -0000 1.192.2.20
@@ -554,9 +554,9 @@
) >config.cache
# set build tool flags
+ export CC="${l_cc}"
export CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}"
export CFLAGS="$CPPFLAGS"
- export CC="${l_cc} $CPPFLAGS"
export LDFLAGS="-L$br/zlib-%{V_zlib} -L$br/bzip2-%{V_bzip2}
-L$br/beecrypt-%{V_beecrypt}"
export LIBS="$LDFLAGS -lz -lbz2 -lbeecrypt"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.5.2.8 -r1.5.2.9 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 26 Aug 2003 08:50:56 -0000 1.5.2.8
+++ openpkg-src/openpkg/rpm.patch.porting 26 Aug 2003 11:12:27 -0000 1.5.2.9
@@ -175,11 +175,10 @@
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
-| Additionally, disable the building of programs we don't need.
+---------------------------------------------------------------------------
Index: rpmdb/Makefile.am
--- rpmdb/Makefile.am 2 Jul 2003 20:14:07 -0000 1.1.1.7
-+++ rpmdb/Makefile.am 26 Aug 2003 07:40:42 -0000
++++ rpmdb/Makefile.am 26 Aug 2003 10:10:23 -0000
@@ -18,7 +18,7 @@
EXTRA_PROGRAMS = tjfn
@@ -189,19 +188,7 @@
tjfn_LDADD = librpmdb.la
pkgincdir = $(pkgincludedir)
-@@ -26,11 +26,6 @@
- noinst_HEADERS = fprint.h header_internal.h legacy.h
-
- pkgbindir = @RPMCONFIGDIR@
--pkgbin_PROGRAMS = \
-- rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify
--noinst_PROGRAMS = \
-- rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \
-- rpmdb_upgrade
-
- mylibs = librpmdb.la
-
-@@ -180,4 +175,4 @@
+@@ -180,4 +180,4 @@
$(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
tdbi: librpmdb.la tdbi.o
@@ -212,11 +199,10 @@
| Use GNU libtool's weaker -static (link with own static libraries)
| instead of the strong -all-static (link even with static libc, etc),
| because OpenPKG does not need to be fully static.
-| Additionally, disable the building of programs we don't need.
+---------------------------------------------------------------------------
Index: rpmdb/Makefile.in
--- rpmdb/Makefile.in 16 Jul 2003 17:05:48 -0000 1.1.1.7
-+++ rpmdb/Makefile.in 26 Aug 2003 07:39:42 -0000
++++ rpmdb/Makefile.in 26 Aug 2003 10:10:46 -0000
@@ -273,7 +273,7 @@
EXTRA_PROGRAMS = tjfn
@@ -226,15 +212,6 @@
tjfn_LDADD = librpmdb.la
pkgincdir = $(pkgincludedir)
-@@ -418,7 +418,7 @@
- pkgbin_PROGRAMS = rpmdb_deadlock$(EXEEXT) rpmdb_dump$(EXEEXT) \
- rpmdb_load$(EXEEXT) rpmdb_svc$(EXEEXT) rpmdb_stat$(EXEEXT) \
- rpmdb_verify$(EXEEXT)
--PROGRAMS = $(noinst_PROGRAMS) $(pkgbin_PROGRAMS)
-+PROGRAMS =
-
- am_rpmdb_archive_OBJECTS =
- rpmdb_archive_OBJECTS = $(am_rpmdb_archive_OBJECTS)
@@ -952,7 +952,7 @@
$(LINT) $(DEFS) $(INCLUDES) $(librpmdb_la_SOURCES)
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
