From 14bbe7694804a79c6699a2fcc1ea264fafe6ddc7 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 8 Nov 2005 15:50:28 +0000 Subject: [PATCH] - avoid -L poisoning in *.la Changed files: rpm-cleanlibdirs.patch -> 1.1 --- rpm-cleanlibdirs.patch | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 rpm-cleanlibdirs.patch diff --git a/rpm-cleanlibdirs.patch b/rpm-cleanlibdirs.patch new file mode 100644 index 0000000..344dca7 --- /dev/null +++ b/rpm-cleanlibdirs.patch @@ -0,0 +1,57 @@ +--- rpm-4.4.2/rpmio/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 ++++ rpm-4.4.2/rpmio/Makefile.am 2005-11-08 15:56:58.000000000 +0100 +@@ -26,8 +26,6 @@ + + BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs) + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpmio.la + librpmio_la_SOURCES = \ +--- rpm-4.4.2/rpmdb/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 ++++ rpm-4.4.2/rpmdb/Makefile.am 2005-11-08 15:56:49.000000000 +0100 +@@ -37,9 +37,6 @@ + # XXX watchout, ../db3/libdb.la created by this Makefile may surprise + libdb_la = + +-# XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpmdb.la + librpmdb_la_SOURCES = \ +--- rpm-4.4.2/lib/Makefile.am.orig 2005-10-07 13:52:53.000000000 +0200 ++++ rpm-4.4.2/lib/Makefile.am 2005-11-08 15:56:22.000000000 +0100 +@@ -29,8 +29,6 @@ + mylibs = librpm.la + LIBS = + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpm.la + librpm_la_SOURCES = \ +--- rpm-4.4.2/build/Makefile.am.orig 2005-03-14 11:03:48.000000000 +0100 ++++ rpm-4.4.2/build/Makefile.am 2005-11-08 15:56:12.000000000 +0100 +@@ -22,8 +22,6 @@ + pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h + noinst_HEADERS = buildio.h + +-LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +- + usrlibdir = $(libdir)@MARK64@ + usrlib_LTLIBRARIES = librpmbuild.la + librpmbuild_la_SOURCES = \ +--- rpm-4.4.2/configure.ac.orig 2005-10-07 13:52:54.000000000 +0200 ++++ rpm-4.4.2/configure.ac 2005-11-08 15:55:31.000000000 +0100 +@@ -350,9 +350,6 @@ + localdone= + + dirs=$prefix +-if test "$cross_compiling" != "yes"; then +- dirs="$dirs /usr/local" +-fi + for dir in $dirs + do + case $dir in -- 2.43.0