]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-macros.patch
- fix prep failures
[packages/rpm.git] / rpm-macros.patch
CommitLineData
dc6aae45
JB
1--- rpm-4.4.3/macros.in.orig 2005-11-19 01:18:44.483914640 +0100
2+++ rpm-4.4.3/macros.in 2005-11-19 01:19:50.657854672 +0100
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}
a3b822b2
JB
12@@ -932,10 +932,10 @@
13 export RPM_BUILD_ROOT}\
14 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
15 export CLASSPATH}\
16- unset PERL_MM_OPT\
17+ unset PERL_MM_OPT || :\
18 LANG=C\
19 export LANG\
20- unset DISPLAY\
21+ unset DISPLAY || :\
22 \
23 %{verbose:set -x}%{!verbose:exec > /dev/null}\
24 umask 022\
dc6aae45
JB
25@@ -1373,5 +1373,18 @@
26 #%__executable_provides @RPMCONFIGDIR@/executabledeps.sh --provides
27 #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
e493253e
ER
28
29+# PLD rpm macros
30+%_enable_debug_packages 1
31+
32+#-----------------------------------------------------------------
33+# CFLAGS and LDFLAGS used to build
34+
35+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
36+
37+%debugcflags -O0 -g -Wall
38+%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
39+%rpmcxxflags %{rpmcflags}
40+%rpmldflags %{nil}
41+
42 # \endverbatim
43 #*/
This page took 0.033821 seconds and 4 git commands to generate.