RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Dec-2009 01:42:53
Branch: HEAD Handle: 2009121800425201
Modified files:
rpm Makefile.am
rpm/tools Makefile.am
Log:
- get @LDFLAGS_STATIC drilled correctly.
Summary:
Revision Changes Path
2.246 +2 -2 rpm/Makefile.am
2.142 +20 -6 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.245 -r2.246 Makefile.am
--- rpm/Makefile.am 25 Sep 2009 10:16:31 -0000 2.245
+++ rpm/Makefile.am 18 Dec 2009 00:42:52 -0000 2.246
@@ -131,13 +131,13 @@
noinst_HEADERS = build.h debug.h system.h
rpm_SOURCES = $(top_srcdir)/build.c
-rpm_LDFLAGS = @LDFLAGS_STATIC@
+rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpm_LDADD = rpm.o $(myLDADD)
rpm.o: $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV
-o $@ -c $(top_srcdir)/rpmqv.c
rpmbuild_SOURCES = $(top_srcdir)/build.c
-rpmbuild_LDFLAGS = @LDFLAGS_STATIC@
+rpmbuild_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmbuild_LDADD = rpmbuild.o $(myLDADD)
rpmbuild.o: $(top_srcdir)/rpmqv.c
$(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.141 -r2.142 Makefile.am
--- rpm/tools/Makefile.am 13 Dec 2009 22:05:11 -0000 2.141
+++ rpm/tools/Makefile.am 18 Dec 2009 00:42:53 -0000 2.142
@@ -54,36 +54,47 @@
dist_man_MANS = rpmgrep.1
augtool_SOURCES = augtool.c
+augtool_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
augtool_LDADD = $(RPMIO_LDADD_COMMON)
chroot_SOURCES = chroot.c
+chroot_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
chroot_LDADD = $(RPMIO_LDADD_COMMON)
cp_SOURCES = cp.c
+cp_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
cp_LDADD = $(RPMIO_LDADD_COMMON)
debugedit_SOURCES = debugedit.c hashtab.c
+debugedit_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
debugedit_LDADD = $(RPM_LDADD_COMMON)
rpmcache_SOURCES = rpmcache.c
+rpmcache_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmcache_LDADD = $(RPM_LDADD_COMMON)
rpmcmp_SOURCES = rpmcmp.c
-rpmcmp_LDADD = $(RPM_LDADD_COMMON)
+rpmcmp_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
+rpmcmp_LDADD = $(RPMDB_LDADD_COMMON)
rpmdeps_SOURCES = rpmdeps.c
+rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmdeps_LDADD = $(RPM_LDADD_COMMON)
rpmdigest_SOURCES = rpmdigest.c
+rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
find_SOURCES = rpmfind.c
+find_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
find_LDADD = $(RPMIO_LDADD_COMMON)
grep_SOURCES = rpmgrep.c
+grep_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
grep_LDADD = $(RPMIO_LDADD_COMMON)
mtree_SOURCES = rpmmtree.c
+mtree_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
mtree_LDADD = $(RPM_LDADD_COMMON)
rpmrepo_SOURCES = rpmrepo.c
@@ -109,13 +120,15 @@
## Traditional rpm2cpio
##
rpm2cpio_SOURCES = rpm2cpio.c
-rpm2cpio_LDADD = $(RPM_LDADD_COMMON)
+rpm2cpio_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
+rpm2cpio_LDADD = $(LDFLAGS) $(RPM_LDADD_COMMON)
##
## keyctl(1) clone
##
rpmkey_SOURCES = rpmkey.c
-rpmkey_LDADD = $(RPM_LDADD_COMMON) -lkeyutils
+rpmkey_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
+rpmkey_LDADD = $(LDFLAGS) $(RPM_LDADD_COMMON) -lkeyutils
##
## XAR <-> RPM package converter
@@ -141,7 +154,7 @@
db_tool_CPPFLAGS += \
-DWITH_DB_RPC
endif
-db_tool_LDFLAGS =
+db_tool_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
db_tool_LDADD =
# for db_recover
db_tool_LDADD += \
@@ -173,8 +186,9 @@
$(top_builddir)/db3/libdb-4.8.la
endif
-pkgbin_PROGRAMS += db_sql
-db_sql_SOURCES = ../db/db_sql/db_sql.c
+pkgbin_PROGRAMS += db_sql
+db_sql_SOURCES = ../db/db_sql/db_sql.c
+db_sql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
db_sql_LDADD = \
$(top_builddir)/db3/parse.lo \
$(top_builddir)/db3/preparser.lo \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
