- updated

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index df685fef38b321ac2a86c04d2c14f8e78f88aed9..244fa6ad224d78ddd14c1b66fb450ae45dbcd3a0 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,5 +1,6 @@
---- rpm-4.4.3/macros.in        2005-11-19 01:19:50.657854672 +0100
-+++ rpm-4.4.6/macros.in        2006-05-24 11:49:38.438332239 +0300
+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
  
@@ -20,7 +21,7 @@
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
-@@ -932,10 +932,10 @@
+@@ -909,10 +909,10 @@
    export RPM_BUILD_ROOT}\
    %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
    export CLASSPATH}\
@@ -33,7 +34,8 @@
    \
    %{verbose:set -x}%{!verbose:exec > /dev/null}\
    umask 022\
-@@ -1374,4 +1374,17 @@
+@@ -1350,5 +1350,23 @@
+ #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
  
 +# PLD rpm macros
@@ -42,9 +44,14 @@
 +#-----------------------------------------------------------------
 +# 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   %{!?no_build_with_as_needed:-Wl,--as-needed}