- updated for 20040107

[packages/rpm.git] / rpm-python-fix.patch

diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch
index 80036c3dd0e18dc878fb58fd3b86d6e9ce3e175f..bee6b94cdf1d0a58939b8c2e1d3bcc2fb5b0c453 100644 (file)
--- a/rpm-python-fix.patch
+++ b/rpm-python-fix.patch
@@ -1,6 +1,7 @@
---- rpm-4.2/python/Makefile.am.wiget   Wed Jan  8 23:33:12 2003
-+++ rpm-4.2/python/Makefile.am Thu Apr  3 15:52:29 2003
-@@ -28,45 +28,36 @@
+diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am
+--- rpm-4.3.org/python/Makefile.am     2003-12-27 23:56:46.082303664 +0100
++++ rpm-4.3/python/Makefile.am 2003-12-28 00:07:26.082008920 +0100
+@@ -29,46 +29,33 @@
        rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h
  
  mylibs= \
@@ -11,6 +12,7 @@
 +      $(top_builddir)/lib/librpm.la \
 +      $(top_builddir)/rpmdb/librpmdb.la \
 +      $(top_builddir)/rpmio/librpmio.la \
++      -lbeecrypt \
 +      -lpopt \
        @WITH_LIBELF_LIB@
  
@@ -18,49 +20,45 @@
  
  pythondir = $(pylibdir)/site-packages
 -python_PROGRAMS = rpmmodule.so
++python_LTLIBRARIES = rpmmodule.la poptmodule.la
  
  rpmdbdir = $(pylibdir)/site-packages/rpmdb
 -rpmdb_PROGRAMS = _rpmdb.so
 +rpmdb_LTLIBRARIES = _rpmdb.la
  
 -noinst_PROGRAMS = poptmodule.so
-+rpmmodule_la_SOURCES =
-+rpmmodule_la_LIBADD = $(mylibs) $(LIBS) 
-+rpmmodule_la_LDFLAGS = -module -avoid-version
-+
-+_rpmdb_la_SOURCES = _rpmdb.c
-+_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
-+_rpmdb_la_LDFLAGS = -module -avoid-version
-+
-+poptmodule_la_SOURCES = poptmodule.c
-+poptmodule_la_LIBADD = $(mylibs) $(LIBS)
-+poptmodule_la_LDFLAGS = -module -avoid-version
++rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
++rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@
  
 -rpmmodule_so_SOURCES =
 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
--
+-rpmmodule_so_LDADD =  @WITH_BEECRYPT_LIB@
++_rpmdb_la_SOURCES = _rpmdb.c
++_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
+ 
 -_rpmdb_so_SOURCES = _rpmdb.c
 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
--
++poptmodule_la_SOURCES = poptmodule.c
++poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
+ 
 -poptmodule_so_SOURCES = poptmodule.c
 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
 -
 -noinst_LTLIBRARIES = librpmmodule.la
 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-+python_LTLIBRARIES = rpmmodule.la poptmodule.la
 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
-       rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
+       rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
        rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
- 
--rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
--      $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+-librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES))
 -
--_rpmdb.so$(EXEEXT): _rpmdb.lo
--      $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
+-rpmmodule.so$(EXEEXT): librpmmodule.la
+-      $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS)
 -
--poptmodule.so$(EXEEXT): poptmodule.lo
--      $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
+-_rpmdb.so$(EXEEXT): _rpmdb.o
+-      $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS)
 -
+-poptmodule.so$(EXEEXT): poptmodule.o
+-      $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS)
+ 
  # rpmmodule.c header-py.c \
  #     rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
- #     rpmrc-py.c rpmte-py.c rpmts-py.c