rpm-python-fix.patch

   1 --- rpm.org/python/Makefile.am  2004-06-14 12:02:25.891768016 +0200
   2 +++ rpm/python/Makefile.am      2004-06-14 12:08:23.614385912 +0200
   3 @@ -27,48 +27,35 @@
   4         rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h spec-py.h
   5
   6  mylibs= \
   7 -       $(top_builddir)/lib/.libs/librpm.so \
   8 -       $(top_builddir)/rpmdb/.libs/librpmdb.so \
   9 -       $(top_builddir)/rpmio/.libs/librpmio.so \
  10 -       $(top_builddir)/popt/.libs/libpopt.so \
  11 -       $(top_builddir)/build/.libs/librpmbuild.so \
  12 +       $(top_builddir)/lib/librpm.la \
  13 +       $(top_builddir)/rpmdb/librpmdb.la \
  14 +       $(top_builddir)/rpmio/librpmio.la \
  15 +       $(top_builddir)/build/librpmbuild.la \
  16 +       -lbeecrypt \
  17 +       -lpopt \
  18         @WITH_LIBELF_LIB@
  19
  20  LDADD =
  21
  22  pythondir = $(pylibdir)/site-packages
  23 -python_PROGRAMS = rpmmodule.so
  24 +python_LTLIBRARIES = rpmmodule.la poptmodule.la
  25
  26  rpmdbdir = $(pylibdir)/site-packages/rpmdb
  27 -rpmdb_PROGRAMS = _rpmdb.so
  28 +rpmdb_LTLIBRARIES = _rpmdb.la
  29
  30 -noinst_PROGRAMS = poptmodule.so
  31 +rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  32 +rpmmodule_la_LIBADD =  @WITH_BEECRYPT_LIB@
  33
  34 -rpmmodule_so_SOURCES =
  35 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
  36 -rpmmodule_so_LDADD =   @WITH_BEECRYPT_LIB@
  37 +_rpmdb_la_SOURCES = _rpmdb.c
  38 +_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  39
  40 -_rpmdb_so_SOURCES = _rpmdb.c
  41 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
  42 -
  43 -poptmodule_so_SOURCES = poptmodule.c
  44 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
  45 -
  46 -noinst_LTLIBRARIES = librpmmodule.la
  47 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  48 -       rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  49 -       rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c spec-py.c
  50 -librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES))
  51 -
  52 -rpmmodule.so$(EXEEXT): librpmmodule.la
  53 -       $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS)
  54 -
  55 -_rpmdb.so$(EXEEXT): _rpmdb.o
  56 -       $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS)
  57 -
  58 -poptmodule.so$(EXEEXT): poptmodule.o
  59 -       $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS)
  60 +poptmodule_la_SOURCES = poptmodule.c
  61 +poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version
  62
  63 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  64 +                      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  65 +                              rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c spec-py.c
  66 +
  67  # rpmmodule.c header-py.c \
  68  #      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
  69  #      rpmrc-py.c rpmte-py.c rpmts-py.c