[packages/rpm-build-macros: 1/2] - added _host_base_arch macro to avoid _arch abuse in kernel build macros - updated version to 1.652

[baggins]

commit 989d3552496f7095602cdf4284a81ead89bdc34e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 13 08:33:23 2012 +0200

    - added _host_base_arch macro to avoid _arch abuse in kernel build macros
    - updated version to 1.652

 rpm-build-macros.spec | 4 ++--
 rpm.macros            | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e80d20d..ddef283 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,10 +1,10 @@
-%define		rpm_macros_rev	1.651
+%define		rpm_macros_rev	1.652
 %define		find_lang_rev	1.35
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	2
+Release:	1
 License:	GPL
 Group:		Development/Building
 Source0:	rpm.macros
diff --git a/rpm.macros b/rpm.macros
index 4eaf93a..929a3bd 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1091,6 +1091,7 @@ fi; \
 %xmms_effect_plugindir		%{expand:%%global xmms_effect_plugindir %(xmms-config --effect-plugin-dir 2>/dev/null || echo ERROR)}%xmms_effect_plugindir
 %xmms_general_plugindir		%{expand:%%global xmms_general_plugindir %(xmms-config --general-plugin-dir 2>/dev/null || echo ERROR)}%xmms_general_plugindir
 
+%_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
 %_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
 
 # user/group checking macros
@@ -1635,8 +1636,8 @@ done \
 %{!?-m:%{error:%{0}: Required module name/list missing} exit 1}		\
 																	\
 %define Opts 														\\\\\\\
-%if "%{_target_base_arch}" != "%{_arch}"							\\\
-	%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"	\\\
+%if "%{_target_base_arch}" != "%{_host_base_arch}"					\\\
+	%if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" \\\
 	CC="%{kgcc}" ARCH=%{_target_base_arch}							\\\
 	%else															\\\
 	ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/a2cfa83427a9ba66708c0bc654ec860f05b3155e