[packages/rpm/32_on_64: 25/25] package ix86 macros on ix8664
draenog
draenog at pld-linux.org
Wed Nov 6 18:10:35 CET 2013
commit a274eb0e7494322c8d9fbee0be4e3d938291b080
Author: Kacper Kornet <draenog at pld-linux.org>
Date: Tue Aug 27 21:08:58 2013 +0100
package ix86 macros on ix8664
ix8664 hosts can compile ix86 packages. But to do it correctly
the macros for the given architecture have to be present.
rpm.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index fea91ef..148a3d0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1075,7 +1075,7 @@ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux
install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux
install cpu-os-macros/athlon-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
install cpu-os-macros/i386-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
@@ -1349,7 +1349,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%{_rpmlibdir}/macros.d/pld
%{_rpmlibdir}/cpuinfo.yaml
%{_rpmlibdir}/noarch-*
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664}
%{_rpmlibdir}/i?86*
%{_rpmlibdir}/pentium*
%{_rpmlibdir}/athlon*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/a274eb0e7494322c8d9fbee0be4e3d938291b080
More information about the pld-cvs-commit
mailing list