X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-system_libs.patch;h=1ce5a7a2cd0b3487d06174358905efe0ad9b5f57;hb=14bbe7694804a79c6699a2fcc1ea264fafe6ddc7;hp=2102671d824141715fe2cd2590bec4b5dd57eef2;hpb=9768f206050c694fa4f14c41c12dc0f0b36e57ef;p=packages%2Frpm.git diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch index 2102671..1ce5a7a 100644 --- a/rpm-system_libs.patch +++ b/rpm-system_libs.patch @@ -1,39 +1,109 @@ ---- rpm-4.2/rpmio/Makefile.am.wiget Wed Mar 12 15:10:27 2003 -+++ rpm-4.2/rpmio/Makefile.am Wed Mar 12 15:10:27 2003 -@@ -67,34 +67,34 @@ - lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) +diff -urN rpm.org/configure.ac rpm/configure.ac +--- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200 ++++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200 +@@ -1203,7 +1215,7 @@ + dnl # XXX Propagate -lucb to popt ... + dnl export LIBS INCPATH CONFIG_SITE + +-AC_CONFIG_SUBDIRS(popt zlib file sqlite db3) ++AC_CONFIG_SUBDIRS(file) + + AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec + scripts/perl.req scripts/perl.prov +@@ -1227,7 +1239,7 @@ + python/rpmdb/test/Makefile + lua/Makefile + ]) +-AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in ++AC_CONFIG_COMMANDS([default],[[ + echo timestamp > stamp-h.in + + ]],[[]]) +--- rpm-4.4.2/lib/Makefile.am.orig 2005-02-17 01:14:40.000000000 +0100 ++++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:32:57.886832096 +0200 +@@ -98,7 +98,7 @@ + $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ + -lselinux \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la ++ -lpopt + + #tds: tds.c librpm.la + # $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) +@@ -109,8 +109,8 @@ + tthread: tthread.o librpm.la + $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@ + +-tsystem: tsystem.o $(top_builddir)/popt/libpopt.la +- $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la ++tsystem: tsystem.o ++ $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt + + tre: tre.o librpm.la + $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ +diff -urN rpm.org/Makefile.am rpm/Makefile.am +--- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200 ++++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200 +@@ -107,7 +106,6 @@ + -load lib/rpmlib.lcd \ + -load rpmdb/rpmdb.lcd \ + -load rpmio/rpmio.lcd \ +- -load popt/popt.lcd \ + $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) + + .PHONY: lint +--- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100 ++++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100 +@@ -71,47 +71,47 @@ + tax_LDADD = librpmio.la tdigest_SOURCES = tdigest.c --tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -+tdigest_LDADD = librpmio.la -lpopt +-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt ++tdigest_LDADD = librpmio.la -lpopt -lgcrypt tdir_SOURCES = tdir.c - tdir_LDFLAGS = -all-static + tdir_LDFLAGS = @LDFLAGS_STATIC@ -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tdir_LDADD = librpmio.la -lpopt tfts_SOURCES = tfts.c - tfts_LDFLAGS = -all-static + tfts_LDFLAGS = @LDFLAGS_STATIC@ -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tfts_LDADD = librpmio.la -lpopt + tget_SOURCES = tget.c + tget_LDFLAGS = @LDFLAGS_STATIC@ +-tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la ++tget_LDADD = librpmio.la -lpopt + + thkp_SOURCES = thkp.c + thkp_LDFLAGS = @LDFLAGS_STATIC@ +-thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la ++thkp_LDADD = librpmio.la -lpopt + + tput_SOURCES = tput.c + tput_LDFLAGS = @LDFLAGS_STATIC@ +-tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la ++tput_LDADD = librpmio.la -lpopt + + tglob_SOURCES = tglob.c - tglob_LDFLAGS = -all-static + tglob_LDFLAGS = @LDFLAGS_STATIC@ -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tglob_LDADD = librpmio.la -lpopt tinv_SOURCES = tinv.c - tinv_LDFLAGS = -all-static + tinv_LDFLAGS = @LDFLAGS_STATIC@ -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tinv_LDADD = librpmio.la -lpopt tkey_SOURCES = tkey.c - tkey_LDFLAGS = -all-static + tkey_LDFLAGS = @LDFLAGS_STATIC@ -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tkey_LDADD = librpmio.la -lpopt tring_SOURCES = tring.c - tring_LDFLAGS = -all-static + tring_LDFLAGS = @LDFLAGS_STATIC@ -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tring_LDADD = librpmio.la -lpopt @@ -41,76 +111,5 @@ -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la -lpopt - dumpasn1_SOURCES = dumpasn1.c - ---- rpm-4.2/python/Makefile.am.wiget Wed Oct 9 21:09:43 2002 -+++ rpm-4.2/python/Makefile.am Wed Mar 12 15:10:27 2003 -@@ -25,7 +25,7 @@ - $(top_builddir)/lib/.libs/librpm.so \ - $(top_builddir)/rpmdb/.libs/librpmdb.so \ - $(top_builddir)/rpmio/.libs/librpmio.so \ -- $(top_builddir)/popt/.libs/libpopt.so -+ -lpopt - - LDADD = - ---- rpm-4.2/tools/Makefile.am.wiget Thu Oct 24 21:23:46 2002 -+++ rpm-4.2/tools/Makefile.am Wed Mar 12 15:10:27 2003 -@@ -24,7 +24,7 @@ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la \ -+ -lpopt \ - @WITH_LIBELF_LIB@ \ - @INTLLIBS@ - ---- rpm-4.2/configure.ac.wiget Wed Mar 12 15:10:26 2003 -+++ rpm-4.2/configure.ac Wed Mar 12 15:10:27 2003 -@@ -1206,7 +1206,7 @@ - dnl # XXX Propagate -lucb to popt ... - dnl export LIBS INCPATH CONFIG_SITE - --AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) -+AC_CONFIG_SUBDIRS(beecrypt) - - AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec - macros.perl scripts/perl.req scripts/perl.prov ---- rpm-4.2/Makefile.am.wiget Thu Oct 24 22:11:18 2002 -+++ rpm-4.2/Makefile.am Wed Mar 12 15:10:27 2003 -@@ -12,7 +12,7 @@ - po/*.in po/*.po po/rpm.pot \ - rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c - --SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ elfutils file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . -+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . - - INCLUDES = \ - -I$(top_srcdir)/build \ -@@ -35,7 +35,7 @@ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la \ -+ -lpopt \ - @WITH_LIBELF_LIB@ \ - @WITH_ZLIB_LIB@ \ - @INTLLIBS@ \ -@@ -111,7 +111,6 @@ - -load lib/rpmlib.lcd \ - -load rpmdb/rpmdb.lcd \ - -load rpmio/rpmio.lcd \ -- -load popt/popt.lcd \ - $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) - - .PHONY: lclint -@@ -121,8 +120,7 @@ - `make -s sources -C lib` \ - `make -s sources -C rpmdb` \ - `make -s sources -C rpmio` \ -- `make -s sources -C beecrypt` \ -- `make -s sources -C popt` -+ `make -s sources -C beecrypt` - - CVSTAG = r$(subst .,-,$(VERSION)) - + tsw_SOURCES = tsw.c + tsw_LDFLAGS = librpmio.la