]>
Commit | Line | Data |
---|---|---|
70f8787d JR |
1 | --- rpm-5.4.4/macros/macros.rpmbuild.in.builddir~ 2011-12-20 15:36:20.813852241 +0100 |
2 | +++ rpm-5.4.4/macros/macros.rpmbuild.in 2011-12-20 15:37:43.385806877 +0100 | |
3 | @@ -326,8 +326,9 @@ echo "Patch #%{__patch_number} (%{basena | |
4 | %___build_args -e | |
5 | %___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args} | |
6 | %___build_pre \ | |
7 | + RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\ | |
8 | RPM_OPT_FLAGS=\"%{optflags}\"\ | |
9 | - export RPM_OPT_FLAGS\ | |
10 | + export RPM_BUILD_DIR RPM_OPT_FLAGS\ | |
11 | %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\ | |
12 | export RPM_BUILD_ROOT}\ | |
13 | %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\ | |
14 | --- rpm-5.4.4/scripts/find-debuginfo.sh.builddir~ 2011-12-20 15:36:31.962846125 +0100 | |
15 | +++ rpm-5.4.4/scripts/find-debuginfo.sh 2011-12-20 15:36:49.492836503 +0100 | |
16 | @@ -32,7 +32,6 @@ strip_r=false | |
17 | # Barf on missing build IDs. | |
18 | strict=false | |
19 | ||
20 | -RPM_BUILD_DIR="`pwd`" | |
21 | # canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path | |
22 | # and debugedit will ignore them as they are out of build dir. | |
23 | RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR") |