- updated x32 macros with sensible values

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index b764e3ed9138264564cd0b944c5b53f461ee43fc..0f292e18b55e35ae8465860be2c4116c3d024cc5 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -170,6 +170,7 @@ Patch80:    %{name}-revert-gpg-argv-parsing.patch
 Patch81:       %{name}-perl-magic.patch
 Patch82:       %{name}-5.4.15-use-DSA-sig.patch
 Patch83:       %{name}-ignore-missing-macro-files.patch
+Patch84:       x32.patch
 
 # Patches imported from Mandriva
 
@@ -374,9 +375,16 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                x8664   amd64 ia32e x86_64
 
 # stabilize new build environment
+%ifnarch x32
 %define                __newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
 %define                __newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
 %define                __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
+%else
+# x32 is a very special case
+%define                __newcc %{?force_cc}%{!?force_cc:x86_64-pld-linux-gnux32-gcc}
+%define                __newcxx %{?force_cxx}%{!?force_cxx:x86_64-pld-linux-gnux32-g++}
+%define                __newcpp %{?force_cpp}%{!?force_cpp:x86_64-pld-linux-gnux32-gcc -E}
+%endif
 
 %define                _rpmlibdir /usr/lib/rpm
 %define                _noautocompressdoc      RPM-GPG-KEY
@@ -939,6 +947,7 @@ cd -
 %patch80 -p1
 %patch81 -p0
 %patch82 -p1
+%patch84 -p1
 
 %patch1000 -p1
 %patch1001 -p1