summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-11-30 22:49:10 +0000
committerjbj <devnull@localhost>2002-11-30 22:49:10 +0000
commit5dfaaf855c2ee3164deacc7d720ec3c759bed8eb (patch)
tree152befd58e7cf4103a10c42ad904c96f55bd4e57
parent760d3a0c8b9c70b0fac0e6af49e683c9bf289d7e (diff)
downloadrpm-5dfaaf855c2ee3164deacc7d720ec3c759bed8eb.tar.gz
rpm-5dfaaf855c2ee3164deacc7d720ec3c759bed8eb.tar.bz2
rpm-5dfaaf855c2ee3164deacc7d720ec3c759bed8eb.zip
Link rpmcache/rpmgraph statically for now.
CVS patchset: 5909 CVS date: 2002/11/30 22:49:10
-rw-r--r--rpm.spec.in4
-rw-r--r--tools/Makefile.am4
2 files changed, 4 insertions, 4 deletions
diff --git a/rpm.spec.in b/rpm.spec.in
index dd69cd325..826dd6f05 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -27,8 +27,8 @@ Prereq: gawk fileutils textutils mktemp shadow-utils
Requires: popt = 1.8
Obsoletes: rpm-perl < %{version}
-# XXX not really necessary with internal elfutils
-BuildRequires: elfutils
+# XXX necessary only to drag in /usr/lib/libelf.a
+BuildRequires: elfutils-devel >= 0.63
%if !%{with_internal_db}
BuildRequires: db3-devel
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 525131fd8..1ae142234 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -42,13 +42,13 @@ debugedit_SOURCES = debugedit.c hashtab.c
javadeps_SOURCES = javadeps.c
rpmcache_SOURCES = rpmcache.c
-#rpmcache_LDFLAGS = @LDFLAGS_STATIC@
+rpmcache_LDFLAGS = @LDFLAGS_STATIC@
rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la
rpmgraph_SOURCES = rpmgraph.c
-#rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
+rpmgraph_LDFLAGS = @LDFLAGS_STATIC@
rpminject_SOURCES = rpminject.c
rpminject_LDFLAGS = @LDFLAGS_STATIC@