- add fixes and useful features from Mandriva

[packages/rpm.git] / rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch

diff --git a/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
new file mode 100644 (file)
index 0000000..3bc3643
--- /dev/null
+++ b/rpm-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch
@@ -0,0 +1,23 @@
+--- rpm-5.4.4/macros/macros.rpmbuild.in.builddir~      2011-12-20 15:36:20.813852241 +0100
++++ rpm-5.4.4/macros/macros.rpmbuild.in        2011-12-20 15:37:43.385806877 +0100
+@@ -326,8 +326,9 @@ echo "Patch #%{__patch_number} (%{basena
+ %___build_args                -e
+ %___build_cmd         %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} }%{___build_shell} %{___build_args}
+ %___build_pre \
++  RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
+   RPM_OPT_FLAGS=\"%{optflags}\"\
+-  export RPM_OPT_FLAGS\
++  export RPM_BUILD_DIR RPM_OPT_FLAGS\
+   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
+   export RPM_BUILD_ROOT}\
+   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+--- rpm-5.4.4/scripts/find-debuginfo.sh.builddir~      2011-12-20 15:36:31.962846125 +0100
++++ rpm-5.4.4/scripts/find-debuginfo.sh        2011-12-20 15:36:49.492836503 +0100
+@@ -32,7 +32,6 @@ strip_r=false
+ # Barf on missing build IDs.
+ strict=false
+ 
+-RPM_BUILD_DIR="`pwd`"
+ # canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
+ # and debugedit will ignore them as they are out of build dir.
+ RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")