This commit was manufactured by cvs2git to create branch 'rpm-4_5'.

[packages/rpm.git] / rpm-as_needed-fix.patch

diff --git a/rpm-as_needed-fix.patch b/rpm-as_needed-fix.patch
index 12a01cd6d1dd3861e285d3ac9f3819896b10efda..119831ca000a3aa825a9efdab8632d606545a9a1 100644 (file)
--- a/rpm-as_needed-fix.patch
+++ b/rpm-as_needed-fix.patch
@@ -1,11 +1,22 @@
-diff -Nur rpm-4.4.2.orig/build/Makefile.am rpm-4.4.2.as_needed-fix/build/Makefile.am
---- rpm-4.4.2.orig/build/Makefile.am   2006-08-04 22:17:16.000000000 +0200
-+++ rpm-4.4.2.as_needed-fix/build/Makefile.am  2006-08-04 22:17:43.000000000 +0200
-@@ -33,6 +33,7 @@
+diff -urN rpm-4.4.9.org/build/Makefile.am rpm-4.4.9/build/Makefile.am
+--- rpm-4.4.9.org/build/Makefile.am    2007-05-19 14:44:43.000000000 +0200
++++ rpm-4.4.9/build/Makefile.am        2007-11-15 01:51:35.501378544 +0100
+@@ -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@
  
- rpmfile.h:
+ if HAVE_LD_VERSION_SCRIPT
+diff -urN rpm-4.4.9.org/lib/Makefile.am rpm-4.4.9/lib/Makefile.am
+--- rpm-4.4.9.org/lib/Makefile.am      2007-05-19 13:54:06.000000000 +0200
++++ rpm-4.4.9/lib/Makefile.am  2007-11-15 01:52:19.806906700 +0100
+@@ -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@