- keep dwarf-2 on ac

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

diff --git a/rpm-macros-ac.patch b/rpm-macros-ac.patch
index 50d853d4c434396fc83b867b25e370bcee538d5f..7dbcaaa544fa5e58403693f128f2c8138776f7c0 100644 (file)
--- a/rpm-macros-ac.patch
+++ b/rpm-macros-ac.patch
@@ -1,6 +1,6 @@
---- rpm-4.4.9/macros.in        2008-08-12 23:07:34.371259643 +0300
-+++ rpm-4.5/macros.in  2008-09-03 16:47:30.861766714 +0300
-@@ -192,7 +192,7 @@
+--- rpm-4.5/macros.in  2008-09-03 16:47:30.861766714 +0300
++++ rpm-4.5/macros.in  2010-08-23 13:22:02.633790949 +0300
+@@ -198,7 +198,7 @@
  Summary: Debug information for package %{name}\
  Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
  Group: Development/Debug\
@@ -9,7 +9,8 @@
  AutoReqProv: 0\
  %description debuginfo\
  This package provides debug information for package %{name}.\
-@@ -242,6 +242,6 @@
+@@ -243,8 +243,8 @@
+ %_srcrpmdir           %{_topdir}/SRPMS
  
  #     Directory where temporary files can be created.
 -%_tmppath             %(echo "${TMPDIR:-/tmp}")
@@ -18,7 +19,8 @@
 +%tmpdir                       %{expand:%%global tmpdir %(echo "${TMPDIR:-/tmp}")}%tmpdir
  
  #     Path to top of build area.
-@@ -271,6 +271,9 @@
+ %_topdir              %(echo $HOME)/rpm
+@@ -277,6 +277,9 @@
  #
  #%distribution
  
@@ -28,7 +30,7 @@
  #     Configurable distribution URL, same as DistURL: tag in a specfile.
  #     The URL will be used to supply reliable information to tools like
  #     rpmfind.
-@@ -1156,6 +1159,7 @@
+@@ -1178,6 +1181,7 @@
  %_infodir             %{_prefix}/share/info
  %_mandir              %{_prefix}/share/man
  %_localedir           %{_datadir}/locale
@@ -36,7 +38,12 @@
  
  #==============================================================================
  # ---- config.guess platform macros.
-@@ -1468,6 +1472,9 @@
+@@ -1478,10 +1482,13 @@
+ #-----------------------------------------------------------------
+ # CFLAGS and LDFLAGS used to build
+ 
+-%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-3 -g2}%{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