- updated

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index f13cfbbb757ae52ae7ea2606883b9fb595c8fe73..244fa6ad224d78ddd14c1b66fb450ae45dbcd3a0 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,5 +1,6 @@
---- rpm-4.4.3/macros.in.orig   2005-11-19 01:18:44.483914640 +0100
-+++ rpm-4.4.3/macros.in        2005-11-19 01:19:50.657854672 +0100
+diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
+--- rpm-4.4.6.orig/macros.in   2006-08-05 20:52:48.000000000 +0200
++++ rpm-4.4.6.macros/macros.in 2006-08-05 20:53:57.000000000 +0200
 @@ -219,7 +219,7 @@
  %_tmppath             %{_var}/tmp
  
@@ -9,7 +10,31 @@
  
  #     The path to the unzip executable (legacy, use %{__unzip} instead).
  %_unzipbin            %{__unzip}
-@@ -1373,5 +1373,18 @@
+@@ -330,8 +330,8 @@
+ #             "w9.gzdio"      gzip level 9 (default).
+ #             "w9.bzdio"      bzip2 level 9.
+ #
+-#%_source_payload     w9.gzdio
+-#%_binary_payload     w9.gzdio
++%_source_payload      w9.gzdio
++%_binary_payload      w9.lzdio
+ 
+ #     Archive formats to use for source/binary package payloads.
+ #             "cpio"          cpio archive (default)
+@@ -909,10 +909,10 @@
+   export RPM_BUILD_ROOT}\
+   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+   export CLASSPATH}\
+-  unset PERL_MM_OPT\
++  unset PERL_MM_OPT || :\
+   LANG=C\
+   export LANG\
+-  unset DISPLAY\
++  unset DISPLAY || :\
+   \
+   %{verbose:set -x}%{!verbose:exec > /dev/null}\
+   umask 022\
+@@ -1350,5 +1350,23 @@
  #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
  
@@ -19,12 +44,17 @@
 +#-----------------------------------------------------------------
 +# CFLAGS and LDFLAGS used to build
 +
-+%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
 +
 +%debugcflags  -O0 -g -Wall
++%optldflags   -Wl,--as-needed
++
++# Warning: those macros are overwritten by macros.build,
++#          left here for compatibility
 +%rpmcflags    %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags  %{rpmcflags}
-+%rpmldflags   %{nil}
++%rpmldflags   %{!?no_build_with_as_needed:-Wl,--as-needed}
 +
  # \endverbatim
  #*/