RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 17-Oct-2009 13:35:52 Branch: rpm-4_5 Handle: 2009101711355002 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/build Makefile.am rpm/lib Makefile.am rpm/rpmdb Makefile.am rpm/rpmio Makefile.am Log: - avoid -L poisoning in *.la (qbo...@pld). Summary: Revision Changes Path 1.1360.2.132+1 -0 rpm/CHANGES 2.54.2.2 +0 -2 rpm/build/Makefile.am 2.150.2.2 +0 -2 rpm/lib/Makefile.am 1.53.2.6 +0 -3 rpm/rpmdb/Makefile.am 1.77.2.8 +0 -2 rpm/rpmio/Makefile.am ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.131 -r1.1360.2.132 CHANGES --- rpm/CHANGES 17 Oct 2009 11:34:33 -0000 1.1360.2.131 +++ rpm/CHANGES 17 Oct 2009 11:35:50 -0000 1.1360.2.132 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - glen: avoid -L poisoning in *.la (qbo...@pld). - glen: fix build with as-needed (needs patched libtool to trigger it) (spa...@pld). - glen: prevent from passing open file descriptors to pre/post scripts (one fd (12?) was terminal, second (11?) .rpm file) (qbo...@pld). - jbj/glen: strip possible chroot prefix from db opened paths in Open(2) wrapper. LP#347749 @@ . patch -p0 <<'@@ .' Index: rpm/build/Makefile.am ============================================================================ $ cvs diff -u -r2.54.2.1 -r2.54.2.2 Makefile.am --- rpm/build/Makefile.am 17 Oct 2009 11:34:33 -0000 2.54.2.1 +++ rpm/build/Makefile.am 17 Oct 2009 11:35:51 -0000 2.54.2.2 @@ -24,8 +24,6 @@ pkginc_HEADERS = rpmbuild.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 = \ @@ . patch -p0 <<'@@ .' Index: rpm/lib/Makefile.am ============================================================================ $ cvs diff -u -r2.150.2.1 -r2.150.2.2 Makefile.am --- rpm/lib/Makefile.am 17 Oct 2009 11:34:34 -0000 2.150.2.1 +++ rpm/lib/Makefile.am 17 Oct 2009 11:35:51 -0000 2.150.2.2 @@ -30,8 +30,6 @@ mylibs = librpm.la LIBS = -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) - usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpm.la librpm_la_SOURCES = \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am ============================================================================ $ cvs diff -u -r1.53.2.5 -r1.53.2.6 Makefile.am --- rpm/rpmdb/Makefile.am 29 May 2008 14:22:29 -0000 1.53.2.5 +++ rpm/rpmdb/Makefile.am 17 Oct 2009 11:35:51 -0000 1.53.2.6 @@ -45,9 +45,6 @@ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/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 = \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am ============================================================================ $ cvs diff -u -r1.77.2.7 -r1.77.2.8 Makefile.am --- rpm/rpmio/Makefile.am 19 Mar 2009 01:04:42 -0000 1.77.2.7 +++ rpm/rpmio/Makefile.am 17 Oct 2009 11:35:52 -0000 1.77.2.8 @@ -31,8 +31,6 @@ BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECRYPT_SUBDIR@/listobjs) -LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) - usrlibdir = $(libdir)@MARK64@ usrlib_LTLIBRARIES = librpmio.la librpmio_la_SOURCES = \ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
