]>
Commit | Line | Data |
---|---|---|
3f2f32d6 ER |
1 | --- rpm-4.4.3/macros.in 2005-11-19 01:19:50.657854672 +0100 |
2 | +++ rpm-4.4.6/macros.in 2006-05-24 11:49:38.438332239 +0300 | |
dc6aae45 | 3 | @@ -219,7 +219,7 @@ |
e493253e ER |
4 | %_tmppath %{_var}/tmp |
5 | ||
6 | # Path to top of build area. | |
dc6aae45 JB |
7 | -%_topdir %{_usrsrc}/rpm |
8 | +%_topdir %(echo $HOME)/rpm | |
e493253e ER |
9 | |
10 | # The path to the unzip executable (legacy, use %{__unzip} instead). | |
11 | %_unzipbin %{__unzip} | |
3f2f32d6 ER |
12 | @@ -330,8 +330,8 @@ |
13 | # "w9.gzdio" gzip level 9 (default). | |
14 | # "w9.bzdio" bzip2 level 9. | |
15 | # | |
16 | -#%_source_payload w9.gzdio | |
17 | -#%_binary_payload w9.gzdio | |
18 | +%_source_payload w9.gzdio | |
19 | +%_binary_payload w9.lzdio | |
20 | ||
21 | # Archive formats to use for source/binary package payloads. | |
22 | # "cpio" cpio archive (default) | |
a3b822b2 JB |
23 | @@ -932,10 +932,10 @@ |
24 | export RPM_BUILD_ROOT}\ | |
25 | %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ | |
26 | export CLASSPATH}\ | |
27 | - unset PERL_MM_OPT\ | |
28 | + unset PERL_MM_OPT || :\ | |
29 | LANG=C\ | |
30 | export LANG\ | |
31 | - unset DISPLAY\ | |
32 | + unset DISPLAY || :\ | |
33 | \ | |
34 | %{verbose:set -x}%{!verbose:exec > /dev/null}\ | |
35 | umask 022\ | |
3f2f32d6 | 36 | @@ -1374,4 +1374,17 @@ |
dc6aae45 | 37 | #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires |
e493253e ER |
38 | |
39 | +# PLD rpm macros | |
40 | +%_enable_debug_packages 1 | |
41 | + | |
42 | +#----------------------------------------------------------------- | |
43 | +# CFLAGS and LDFLAGS used to build | |
44 | + | |
45 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}} | |
46 | + | |
47 | +%debugcflags -O0 -g -Wall | |
48 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} | |
49 | +%rpmcxxflags %{rpmcflags} | |
50 | +%rpmldflags %{nil} | |
51 | + | |
52 | # \endverbatim | |
53 | #*/ |