- fix: make sure each library has DT_NEEDED for all unresolved syms.

CVS patchset: 5941
CVS date: 2002/12/14 21:39:19

diff --git a/CHANGES b/CHANGES
index 841b1b1..363b69d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@
        - fix: add %%ifnarch noarch to debug_package macro.
        - debug_packages "works", but non-noarch w/o %setup has empty payload.
        - make dependency generation "opt-in" in order to build in distro.
+       - fix: make sure each library has DT_NEEDED for all unresolved syms.
 
 4.0.4 -> 4.1:
        - loosely wire beecrypt library into rpm.

diff --git a/autogen.sh b/autogen.sh
index 3de7db2..898e8f5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -55,7 +55,7 @@ if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
        mandir=/usr/man
        infodir=/usr/info
     fi
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} --without-javaglue "$@"
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} "$@"
 else
     ./configure "$@"
 fi

diff --git a/build/Makefile.am b/build/Makefile.am
index 0d03577..32fd04b 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -26,7 +26,11 @@ librpmbuild_la_SOURCES = \
        parseBuildInstallClean.c parseChangelog.c parseDescription.c \
        parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
        parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
-librpmbuild_la_LDFLAGS = -release @VERSION@ $(top_builddir)/lib/librpm.la
+librpmbuild_la_LDFLAGS = -release @VERSION@ \
+       $(top_builddir)/lib/librpm.la \
+       $(top_builddir)/rpmdb/librpmdb.la \
+       $(top_builddir)/rpmio/librpmio.la \
+       @WITH_LIBELF_LIB@
 
 rpmfile.h:
        @ln -sf $(top_builddir)/file/file.h $@
@@ -36,12 +40,6 @@ files.c rpmfc.c: rpmfile.h
 clean-local:
         rm -f *.o rpmfile.h # .created $(FILELOBJS)
 
-# XXX Add internal libtool dependence
-install-data-local: install-usrlibLTLIBRARIES
-       @cd $(DESTDIR)/$(usrlibdir) && \
-       sed -e "s|^dependency_libs='|& -lrpm-@VERSION@|" < librpmbuild.la > .librpmbuild.la && \
-       mv .librpmbuild.la librpmbuild.la
-
 #BUILT_SOURCES = rpmbuild.lcd
 
 rpmbuild.lcd: Makefile.am ${librpmbuild_la_SOURCES} ${pkginc_HEADERS} ${noinst_HEADERS}

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 35260b0..e3385f6 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,13 +21,7 @@ pkginc_HEADERS = \
 noinst_HEADERS = \
        cpio.h fsm.h manifest.h psm.h rpmlead.h signature.h
 
-mylibpaths = \
-       -L$(top_builddir)/lib \
-       -L$(top_builddir)/rpmdb \
-       -L$(top_builddir)/rpmio \
-       -L$(top_builddir)/popt
-
-mylibs = -lrpm -lrpmdb -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
+mylibs = librpm.la
 LIBS =
 
 usrlibdir = $(libdir)@MARK64@
@@ -40,13 +34,10 @@ librpm_la_SOURCES = \
        rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
        signature.c stringbuf.c transaction.c \
        verify.c
-librpm_la_LDFLAGS = -release @VERSION@ $(top_builddir)/rpmdb/librpmdb.la
-
-# XXX Add internal libtool dependence
-install-data-local: install-usrlibLTLIBRARIES
-       @cd $(DESTDIR)/$(usrlibdir) && \
-       sed -e "s|^dependency_libs='|& -lrpmdb-@VERSION@ -lrpmio-@VERSION@ -lpopt|" < librpm.la > .librpm.la && \
-       mv .librpm.la librpm.la
+librpm_la_LDFLAGS = -release @VERSION@ \
+       $(top_builddir)/rpmdb/librpmdb.la \
+       $(top_builddir)/rpmio/librpmio.la \
+       $(top_builddir)/popt/libpopt.la
 
 getdate.c: getdate.y
        @echo expect 10 shift/reduce conflicts
@@ -95,16 +86,17 @@ lint:
        $(LINT) $(DEFS) $(INCLUDES) $(librpm_la_SOURCES)
 
 th: th.c librpm.la
-       $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibpaths) $(mylibs) $(LIBS)
+       $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
 
 #tds: tds.c librpm.la
-#      $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< librpm.la
+#      $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
 #
+
 trb: trb.o librpm.la
-       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trb.o $(mylibs) $(LIBS)
+       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
 
 tplatform: tplatform.o librpm.la
-       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ tplatform.o $(mylibpaths) $(mylibs) $(LIBS)
+       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
 
 trhn: trhn.o librpm.la
-       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trhn.o $(mylibs) $(LIBS)
+       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)

diff --git a/rpm.spec.in b/rpm.spec.in
index ba92cd5..3638d87 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -460,10 +460,13 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
-* Fri Dec 13 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.25
+* Sat Dec 14 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.25
+- rebuild rpm with internal dependency generation enabled.
+- fix: make sure each library has DT_NEEDED for all unresolved syms.
+
+* Fri Dec 13 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.24
 - debug_packages "works", but non-noarch w/o %setup has empty payload.
 - make dependency generation "opt-in" in order to build in distro.
-- rebuild rpm with internal dependency generation enabled.
 
 * Thu Dec 12 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.23
 - fix: add rpmlib(VersionedDependencies) if versioned Provides: found.

diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 951ce54..902bee4 100644 (file)
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -25,12 +25,6 @@ pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h rpmhash.h
 noinst_HEADERS = fprint.h header_internal.h legacy.h
 
-#mylibpaths = \
-#      -L$(top_builddir)/lib \
-#      -L$(top_builddir)/rpmio \
-#      -L$(top_builddir)/popt
-
-#mylibs = -lrpm -lrpmio -lpopt @WITH_LIBELF_LIB@ @LIBS@ @INTLLIBS@ @LIBMISC@
 mylibs = librpmdb.la
 
 LIBS =
@@ -44,18 +38,16 @@ librpmdb_la_SOURCES = \
        hdrNVR.c header.c header_internal.c legacy.c merge.c \
        poptDB.c rpmhash.c rpmdb.c \
        tagname.c tagtbl.c
-librpmdb_la_LDFLAGS = -release @VERSION@ $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la @WITH_LIBELF_LIB@ @libdb3@
+librpmdb_la_LDFLAGS = -release @VERSION@ \
+       $(top_builddir)/rpmio/librpmio.la \
+       $(top_builddir)/popt/libpopt.la \
+       @WITH_LIBELF_LIB@ \
+       @libdb3@
 librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created
 
 # XXX make sure that db.h symlink is generated
-dbconfig.c: db.h
-
-# XXX Add internal libtool dependence
-install-data-local: install-usrlibLTLIBRARIES
-       @cd $(DESTDIR)/$(usrlibdir) && \
-       sed -e "s|^dependency_libs='|& -lrpmio-@VERSION@|" < librpmdb.la > .librpmdb.la && \
-       mv .librpmdb.la librpmdb.la
+dbconfig.c db3.c: db.h
 
 tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h 
        @echo '/*@-bounds@*/' > $@

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 2e350e8..6e79630 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -27,16 +27,13 @@ usrlib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = digest.c fts.c macro.c \
        rpmio.c rpmlog.c rpmmalloc.c \
        rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
-librpmio_la_LDFLAGS = -release @VERSION@ $(top_builddir)/file/libfmagic.la @WITH_ZLIB_LIB@ -lrt -lpthread
+librpmio_la_LDFLAGS = -release @VERSION@ \
+       $(top_builddir)/file/libfmagic.la \
+       @WITH_ZLIB_LIB@ \
+       -lrt -lpthread
 librpmio_la_LIBADD = $(BEECRYPTLOBJS)
 librpmio_la_DEPENDENCIES = .created
 
-# XXX Add internal libtool dependence
-install-data-local: install-usrlibLTLIBRARIES
-       @cd $(DESTDIR)/$(usrlibdir) && \
-       sed -e "s|^dependency_libs='|& -lpopt|" < librpmio.la > .librpmio.la && \
-       mv .librpmio.la librpmio.la
-
 $(top_builddir)/beecrypt/listobjs:
        ${MAKE} -C $(top_builddir)/beecrypt listobjs