]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-macros.patch
- rel 3; display some error message when source files are missing
[packages/rpm.git] / rpm-macros.patch
CommitLineData
5bfda13a
AM
1diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
2--- rpm-4.4.7.org/macros.in 2007-01-06 18:28:22.094067000 +0100
3bf6878c 3+++ rpm-4.4.7/macros.in 2007-01-06 21:09:28.566184000 +0100
5bfda13a
AM
4@@ -217,10 +217,11 @@
5 %_srcrpmdir %{_topdir}/SRPMS
6
7 # Directory where temporaray files can be created.
8-%_tmppath %{_var}/tmp
9+%_tmppath %(echo "${TMPDIR:-/tmp}")
10+%tmpdir %{_tmppath}
e493253e
ER
11
12 # Path to top of build area.
dc6aae45
JB
13-%_topdir %{_usrsrc}/rpm
14+%_topdir %(echo $HOME)/rpm
e493253e
ER
15
16 # The path to the unzip executable (legacy, use %{__unzip} instead).
17 %_unzipbin %{__unzip}
5bfda13a
AM
18@@ -233,7 +234,7 @@
19 # Configurable build root path, same as BuildRoot: in a specfile.
20 # (Note: the configured macro value will override the spec file value).
21 #
22-%buildroot %{_tmppath}/%{name}-root
23+%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
24
25 # The sub-directory (relative to %{_builddir}) where sources are compiled.
26 # This macro is set after processing %setup, either explicitly from the
27@@ -331,8 +332,8 @@
3f2f32d6
ER
28 # "w9.gzdio" gzip level 9 (default).
29 # "w9.bzdio" bzip2 level 9.
30 #
31-#%_source_payload w9.gzdio
32-#%_binary_payload w9.gzdio
33+%_source_payload w9.gzdio
34+%_binary_payload w9.lzdio
35
36 # Archive formats to use for source/binary package payloads.
37 # "cpio" cpio archive (default)
5bfda13a 38@@ -481,7 +482,7 @@
e72fb97a
AM
39
40 #
41 # Path to magic file used for file classification.
42-%_rpmfc_magic_path %{_usr}/lib/rpm/magic
43+%_rpmfc_magic_path /usr/share/file/magic
44
45 #==============================================================================
46 # ---- Database configuration macros.
5bfda13a 47@@ -929,10 +930,10 @@
a3b822b2
JB
48 export RPM_BUILD_ROOT}\
49 %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
50 export CLASSPATH}\
51- unset PERL_MM_OPT\
52+ unset PERL_MM_OPT || :\
53 LANG=C\
54 export LANG\
55- unset DISPLAY\
56+ unset DISPLAY || :\
57 \
58 %{verbose:set -x}%{!verbose:exec > /dev/null}\
59 umask 022\
3bf6878c
AM
60@@ -1091,7 +1092,7 @@
61 %_includedir %{_prefix}/include
62 %_oldincludedir /usr/include
63 %_infodir %{_prefix}/info
64-%_mandir %{_prefix}/man
65+%_mandir %{_prefix}/share/man
66
67 #==============================================================================
68 # ---- config.guess platform macros.
5bfda13a 69@@ -1371,5 +1372,23 @@
dc6aae45 70 #%__executable_requires @RPMCONFIGDIR@/executabledeps.sh --requires
5bfda13a 71 %__scriptlet_requires /bin/bash --rpm-requires
e493253e
ER
72
73+# PLD rpm macros
74+%_enable_debug_packages 1
75+
76+#-----------------------------------------------------------------
77+# CFLAGS and LDFLAGS used to build
78+
5dda5fa7
PS
79+%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
80+# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
e493253e
ER
81+
82+%debugcflags -O0 -g -Wall
5b60995d 83+%optldflags -Wl,--as-needed
84+
85+# Warning: those macros are overwritten by macros.build,
86+# left here for compatibility
e493253e
ER
87+%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
88+%rpmcxxflags %{rpmcflags}
4126bfd3 89+%rpmldflags %{!?no_build_with_as_needed:-Wl,--as-needed}
e493253e
ER
90+
91 # \endverbatim
92 #*/
e72fb97a 93
This page took 0.063599 seconds and 4 git commands to generate.