File convertdb1static.diff of Package rpm

Overview Repositories Revisions Requests Users Attributes Meta

File convertdb1static.diff of Package rpm (Revision 2e85c4febedda84ffca57a659f8ffbb0)

Currently displaying revision 2e85c4febedda84ffca57a659f8ffbb0 , Show latest

Build convertdb1 as static binary so that it always works.

diff -ur ./tools/Makefile.am ../rpm-4.4.2.orig/tools/Makefile.am
--- ./tools/Makefile.am	2006-09-21 19:35:56.000000000 +0200
+++ ../rpm-4.4.2.orig/tools/Makefile.am	2006-09-21 20:59:01.000000000 +0200
@@ -18,22 +18,26 @@
 
 EXTRA_DIST =	rpminject.c rpmsort.c rpmxml.c rpmxp.c rpmxp.h hashtab.h
 
-EXTRA_PROGRAMS = debugedit convertdb1 rpminject rpmsort rpmtool rpmxml
+EXTRA_PROGRAMS = rpminject rpmsort rpmtool rpmxml
 
 LDADD = \
 	$(top_builddir)/lib/librpm.la
 
-staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+staticLDFLAGS = @LDFLAGS_STATIC@ # @LDFLAGS_NPTL@
 
 noinst_PROGRAMS = dumpdb
 
 pkgbindir = @RPMCONFIGDIR@
-pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
+pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile convertdb1
 MAGIC	= $(pkgbindir)/magic
 
 bin_PROGRAMS =	rpmgraph
 
 convertdb1_SOURCES =	convertdb1.c
+convertdb1_LDFLAGS =	$(staticLDFLAGS)
+convertdb1_LDADD = \
+	$(top_builddir)/lib/librpm.la \
+	@WITH_LIBELF_LIB@
 
 debugedit_SOURCES =	debugedit.c hashtab.c
 debugedit_LDADD =	@LDFLAGS_STATIC@ \

Places

File convertdb1static.diff of Package rpm (Revision 2e85c4febedda84ffca57a659f8ffbb0)

Places