rpm-python-fix.patch

   1 --- rpm-4.2/python/Makefile.am.wiget    Wed Jan  8 23:33:12 2003
   2 +++ rpm-4.2/python/Makefile.am  Thu Apr  3 15:52:29 2003
   3 @@ -28,45 +28,36 @@
   4         rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-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)/lib/librpm.la \
  12 +       $(top_builddir)/rpmdb/librpmdb.la \
  13 +       $(top_builddir)/rpmio/librpmio.la \
  14 +       -lpopt \
  15         @WITH_LIBELF_LIB@
  16
  17  LDADD =
  18
  19  pythondir = $(pylibdir)/site-packages
  20 -python_PROGRAMS = rpmmodule.so
  21
  22  rpmdbdir = $(pylibdir)/site-packages/rpmdb
  23 -rpmdb_PROGRAMS = _rpmdb.so
  24 +rpmdb_LTLIBRARIES = _rpmdb.la
  25
  26 -noinst_PROGRAMS = poptmodule.so
  27 +rpmmodule_la_SOURCES =
  28 +rpmmodule_la_LIBADD = $(mylibs) $(LIBS)
  29 +rpmmodule_la_LDFLAGS = -module -avoid-version
  30 +
  31 +_rpmdb_la_SOURCES = _rpmdb.c
  32 +_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
  33 +_rpmdb_la_LDFLAGS = -module -avoid-version
  34 +
  35 +poptmodule_la_SOURCES = poptmodule.c
  36 +poptmodule_la_LIBADD = $(mylibs) $(LIBS)
  37 +poptmodule_la_LDFLAGS = -module -avoid-version
  38
  39 -rpmmodule_so_SOURCES =
  40 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
  41 -
  42 -_rpmdb_so_SOURCES = _rpmdb.c
  43 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
  44 -
  45 -poptmodule_so_SOURCES = poptmodule.c
  46 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
  47 -
  48 -noinst_LTLIBRARIES = librpmmodule.la
  49 -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  50 +python_LTLIBRARIES = rpmmodule.la poptmodule.la
  51 +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \
  52         rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
  53         rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
  54
  55 -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
  56 -       $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
  57 -
  58 -_rpmdb.so$(EXEEXT): _rpmdb.lo
  59 -       $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
  60 -
  61 -poptmodule.so$(EXEEXT): poptmodule.lo
  62 -       $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
  63 -
  64  # rpmmodule.c header-py.c \
  65  #      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
  66  #      rpmrc-py.c rpmte-py.c rpmts-py.c