rpm-system_libs-more.patch

   1 --- rpm-4.2/xmlspec/Makefile.wiget      Fri Oct 11 00:51:15 2002
   2 +++ rpm-4.2/xmlspec/Makefile    Thu Mar 27 16:01:27 2003
   3 @@ -22,8 +22,8 @@
   4
   5  LIBS          = $(XMLLIB) $(RPMDIR)/build/.libs/librpmbuild.a \
   6                 $(RPMDIR)/lib/.libs/librpm.a $(RPMDIR)/rpmdb/.libs/librpmdb.a \
   7 -               $(RPMDIR)/rpmio/.libs/librpmio.a $(RPMDIR)/popt/.libs/libpopt.a \
   8 -               $(RPMDIR)/libelf/lib/.libs/libelf.a \
   9 +               $(RPMDIR)/rpmio/.libs/librpmio.a -lpopt \
  10 +               -lelf -ldb\
  11                 -lz -lexpat -lbz2
  12  LIBDIR        = -L. -L$(RPMDIR)/.libs -L/usr/lib
  13
  14 --- rpm-4.2/python/Makefile.am.wiget    Thu Mar 27 16:01:27 2003
  15 +++ rpm-4.2/python/Makefile.am  Thu Mar 27 16:01:27 2003
  16 @@ -22,44 +22,36 @@
  17         upgrade.h
  18
  19  mylibs= \
  20 -       $(top_builddir)/lib/.libs/librpm.so \
  21 -       $(top_builddir)/rpmdb/.libs/librpmdb.so \
  22 -       $(top_builddir)/rpmio/.libs/librpmio.so \
  23 +       $(top_builddir)/lib/librpm.la \
  24 +       $(top_builddir)/rpmdb/librpmdb.la \
  25 +       $(top_builddir)/rpmio/librpmio.la \
  26         -lpopt
  27
  28  LDADD =
  29  CFLAGS = @CFLAGS@ -fPIC
  30
  31  pythondir = $(prefix)/lib/python${PYVER}/site-packages
  32 -python_PROGRAMS = rpmmodule.so
  33 +python_LTLIBRARIES = rpmmodule.la
  34
  35  rpmdbdir = $(prefix)/lib/python${PYVER}/site-packages/rpmdb
  36 -rpmdb_PROGRAMS = _rpmdb.so
  37 +rpmdb_LTLIBRARIES = _rpmdb.la
  38
  39 -noinst_PROGRAMS = poptmodule.so
  40
  41 -rpmmodule_so_SOURCES =
  42 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
  43 +rpmmodule_la_SOURCES =
  44 +rpmmodule_la_LDFLAGS = $(LIBS) -avoid-version -module
  45 +rpmmodule_la_LIBADD = $(mylibs) $(top_builddir)/python/librpmmodule.la
  46
  47 -_rpmdb_so_SOURCES = _rpmdb.c
  48 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
  49 +_rpmdb_la_SOURCES = _rpmdb.c
  50 +_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -avoid-version -module
  51
  52 -poptmodule_so_SOURCES = poptmodule.c
  53 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
  54 +poptmodule_la_SOURCES = poptmodule.c
  55 +poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -avoid-version -module
  56
  57 -noinst_LTLIBRARIES = librpmmodule.la
  58 +noinst_LTLIBRARIES = librpmmodule.la poptmodule.la
  59  librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c header-py.c \
  60         rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
  61         rpmrc-py.c rpmte-py.c rpmts-py.c
  62
  63 -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
  64 -       $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
  65 -
  66 -_rpmdb.so$(EXEEXT): _rpmdb.lo
  67 -       $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
  68 -
  69 -poptmodule.so$(EXEEXT): poptmodule.lo
  70 -       $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
  71
  72  # rpmmodule.c hash.c upgrade.c header-py.c \
  73  #      rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
  74 --- rpm-4.2/tools/striptofile.c.wiget   Wed Oct  9 21:09:51 2002
  75 +++ rpm-4.2/tools/striptofile.c Thu Mar 27 16:01:27 2003
  76 @@ -1,8 +1,13 @@
  77  #include "system.h"
  78
  79  #include <elf.h>
  80 +#ifdef HAVE_GELF_H
  81 +#include <libelf.h>
  82 +#include <gelf.h>
  83 +#else
  84  #include <libelf/libelf.h>
  85  #include <libelf/gelf.h>
  86 +#endif
  87  #include <popt.h>
  88
  89  #include "sections.h"
  90 --- rpm-4.2/tools/sections.h.wiget      Thu Aug 22 19:55:31 2002
  91 +++ rpm-4.2/tools/sections.h    Thu Mar 27 16:01:27 2003
  92 @@ -1,7 +1,11 @@
  93  #ifndef SECTIONS_H
  94  #define SECTIONS_H
  95
  96 +#ifdef HAVE_GELF_H
  97 +#include <gelf.h>
  98 +#else
  99  #include <libelf/gelf.h>
 100 +#endif
 101
 102  typedef struct {
 103    GElf_Word debug_section; /* Section index in debug file. */
 104 --- rpm-4.2/tools/unstripfile.c.wiget   Sun Oct  6 07:42:58 2002
 105 +++ rpm-4.2/tools/unstripfile.c Thu Mar 27 16:01:27 2003
 106 @@ -1,8 +1,13 @@
 107  #include "system.h"
 108
 109  #include <elf.h>
 110 +#ifdef HAVE_GELF_H
 111 +#include <gelf.h>
 112 +#include <libelf.h>
 113 +#else
 114  #include <libelf/libelf.h>
 115  #include <libelf/gelf.h>
 116 +#endif
 117
 118  #include "sections.h"
 119  #include "utils.h"
 120 --- rpm-4.2/configure.ac.wiget  Thu Mar 27 16:01:26 2003
 121 +++ rpm-4.2/configure.ac        Thu Mar 27 16:26:51 2003
 122 @@ -367,6 +367,11 @@
 123  WITH_LIBELF_INCLUDE=
 124  WITH_LIBELF_LIB=
 125  WITH_LIBELF_ARCHIVE=
 126 +AC_CHECK_LIB(elf, gelf_getehdr,[
 127 +       WITH_LIBELF_LIB="-lelf"
 128 +       WITH_LIBELF_ARCHIVE="-lelf"
 129 +       AC_CHECK_HEADERS([gelf.h libelf.h libelf/gelf.h libelf/libelf.h])
 130 +       ],[
 131         if test -d elfutils/libelf ; then
 132             AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have the <gelf.h> header file.])
 133             AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the `elf' library (-lelf).])
 134 @@ -374,7 +379,7 @@
 135             WITH_LIBELF_INCLUDE="-I\${top_srcdir}/${WITH_LIBELF_SUBDIR}"
 136             WITH_LIBELF_LIB="\${top_builddir}/${WITH_LIBELF_SUBDIR}/libelf.la"
 137             WITH_LIBELF_ARCHIVE="\${top_builddir}/${WITH_LIBELF_SUBDIR}/.libs/libelf.a"
 138 -       fi
 139 +       fi])
 140  AC_SUBST(WITH_LIBELF_SUBDIR)
 141  AC_SUBST(WITH_LIBELF_INCLUDE)
 142  AC_SUBST(WITH_LIBELF_LIB)
 143 @@ -384,6 +389,11 @@
 144  WITH_LIBDWARF_INCLUDE=
 145  WITH_LIBDWARF_LIB=
 146  WITH_LIBDWARF_ARCHIVE=
 147 +AC_CHECK_LIB(dwarf, dwarf_init,[
 148 +       WITH_LIBDWARF_LIB="-ldwarf"
 149 +       WITH_LIBDWARF_ARCHIVE="-ldwarf"
 150 +       AC_CHECK_HEADERS([dwarf.h])
 151 +       ],[
 152         if test -d elfutils/libdwarf ; then
 153             AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
 154             AC_DEFINE(HAVE_LIBDWARF, 1, [Define to 1 if you have the `dwarf' library (-ldwarf).])
 155 @@ -391,7 +401,7 @@
 156             WITH_LIBDWARF_INCLUDE="-I\${top_srcdir}/${WITH_LIBDWARF_SUBDIR}"
 157             WITH_LIBDWARF_LIB="\${top_builddir}/${WITH_LIBDWARF_SUBDIR}/libdwarf.la"
 158             WITH_LIBDWARF_ARCHIVE="\${top_builddir}/${WITH_LIBDWARF_SUBDIR}/.libs/libdwarf.a"
 159 -       fi
 160 +       fi])
 161  AC_SUBST(WITH_LIBDWARF_SUBDIR)
 162  AC_SUBST(WITH_LIBDWARF_INCLUDE)
 163  AC_SUBST(WITH_LIBDWARF_LIB)
 164 @@ -451,10 +461,11 @@
 165  if test $withval = no ; then
 166  dnl ------------------ without internal db
 167
 168 -AC_CHECK_HEADERS(db3/db.h)
 169 +AC_CHECK_HEADERS([db3/db.h db.h])
 170
 171  dnl Check for Berkeley db3 API.
 172  AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
 173 +  AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
 174    AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
 175      AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
 176        AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
 177 @@ -463,6 +474,7 @@
 178        )
 179      )
 180    )
 181 +  )
 182  )
 183
 184  if test X"$DBLIBSRCS" = X; then
 185 @@ -1228,7 +1240,7 @@
 186         python/Makefile
 187         python/rpmdb/Makefile
 188         python/test/Makefile
 189 -  ], [ echo timestamp > popt/stamp-h.in
 190 +  ], [
 191         echo timestamp > beecrypt/stamp-h.in
 192         echo timestamp > stamp-h.in
 193    ]