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:34:34 Branch: rpm-4_5 Handle: 2009101711343301 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/build Makefile.am rpm/lib Makefile.am Log: - fix build with as-needed (needs patched libtool to trigger it) (spa...@pld). Summary: Revision Changes Path 1.1360.2.131+1 -0 rpm/CHANGES 2.54.2.1 +1 -0 rpm/build/Makefile.am 2.150.2.1 +1 -0 rpm/lib/Makefile.am ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.130 -r1.1360.2.131 CHANGES --- rpm/CHANGES 17 Oct 2009 11:33:21 -0000 1.1360.2.130 +++ rpm/CHANGES 17 Oct 2009 11:34:33 -0000 1.1360.2.131 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - 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 - jbj: reserve ~1K in RPMSIGTAG_PADDING for now. @@ . patch -p0 <<'@@ .' Index: rpm/build/Makefile.am ============================================================================ $ cvs diff -u -r2.54 -r2.54.2.1 Makefile.am --- rpm/build/Makefile.am 25 May 2007 17:35:56 -0000 2.54 +++ rpm/build/Makefile.am 17 Oct 2009 11:34:33 -0000 2.54.2.1 @@ -37,6 +37,7 @@ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_MAGIC_LIB@ \ @WITH_LIBELF_LIB@ if HAVE_LD_VERSION_SCRIPT @@ . patch -p0 <<'@@ .' Index: rpm/lib/Makefile.am ============================================================================ $ cvs diff -u -r2.150 -r2.150.2.1 Makefile.am --- rpm/lib/Makefile.am 25 May 2007 17:36:02 -0000 2.150 +++ rpm/lib/Makefile.am 17 Oct 2009 11:34:34 -0000 2.150.2.1 @@ -46,6 +46,7 @@ librpm_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la \ + @WITH_MAGIC_LIB@ \ @WITH_POPT_LIB@ \ @WITH_SELINUX_LIB@ \ @LTLIBINTL@ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
