1 diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
2 --- rpm-4.4.6.orig/macros.in 2006-08-05 20:52:48.000000000 +0200
3 +++ rpm-4.4.6.macros/macros.in 2006-08-05 20:53:57.000000000 +0200
7 # Path to top of build area.
8 -%_topdir %{_usrsrc}/rpm
9 +%_topdir %(echo $HOME)/rpm
11 # The path to the unzip executable (legacy, use %{__unzip} instead).
14 # "w9.gzdio" gzip level 9 (default).
15 # "w9.bzdio" bzip2 level 9.
17 -#%_source_payload w9.gzdio
18 -#%_binary_payload w9.gzdio
19 +%_source_payload w9.gzdio
20 +%_binary_payload w9.lzdio
22 # Archive formats to use for source/binary package payloads.
23 # "cpio" cpio archive (default)
27 # Path to magic file used for file classification.
28 -%_rpmfc_magic_path %{_usr}/lib/rpm/magic
29 +%_rpmfc_magic_path /usr/share/file/magic
31 #==============================================================================
32 # ---- Database configuration macros.
34 export RPM_BUILD_ROOT}\
35 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
38 + unset PERL_MM_OPT || :\
44 %{verbose:set -x}%{!verbose:exec > /dev/null}\
46 @@ -1350,5 +1350,23 @@
47 #%__executable_provides @RPMCONFIGDIR@/executabledeps.sh --provides
48 #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
51 +%_enable_debug_packages 1
53 +#-----------------------------------------------------------------
54 +# CFLAGS and LDFLAGS used to build
56 +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
57 +# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
59 +%debugcflags -O0 -g -Wall
60 +%optldflags -Wl,--as-needed
62 +# Warning: those macros are overwritten by macros.build,
63 +# left here for compatibility
64 +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
65 +%rpmcxxflags %{rpmcflags}
66 +%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}