set %_host_cpu32 (used instead of %_host_cpu when run through linux32)

(cf patch rpm-4.4.8-use_host_cpu32-when-linux32.patch in rpm)

3 files changed, 10 insertions, 0 deletions

diff --git a/Makefile.am b/Makefile.am
index 39cd03b..808e6bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,8 @@ pkg_scripts_in = $(pkg_gscripts:=.in)
 
 BUILT_SOURCES = macros-perarch make_macrosfiles.sh rpmgenplatform
 
+HOST_CPU32_MACRO = $(if $(CANONTARGETCPU32),%_host_cpu32 $(CANONTARGETCPU32),\#%_host_cpu32)
+
 pkglibdir = @RPMVENDORDIR@
 
 noinst_PROGRAMS = rpmeval
@@ -79,6 +81,7 @@ edit = sed \
 	-e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\
 	-e 's,@RPMOS\@,$(RPMOS),g' \
 	-e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
+	-e 's,@HOST_CPU32_MACRO\@,$(HOST_CPU32_MACRO),g' \
 	-e 's,@RPMALLARCH\@,$(RPMALLARCH),g' 
 
 %: %.in Makefile
diff --git a/configure.ac b/configure.ac
index 02c6e64..58cc4c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ case "${target_cpu}" in
     x86_64|amd64)
     RPMALLARCH="i386 i486 i586 i686 k6 athlon pentium3 pentium4 amd64 x86_64"
     CANONTARGETCPU=x86_64
+    CANONTARGETCPU32=i586
     ;;
     ppc|powerpc)
     RPMALLARCH="ppc"
@@ -52,6 +53,7 @@ esac
 RPMALLARCH="${RPMALLARCH} noarch"
 AC_SUBST(RPMALLARCH)
 AC_SUBST(CANONTARGETCPU)
+AC_SUBST(CANONTARGETCPU32)
 
 #
 # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
diff --git a/macros.in b/macros.in
index ee53095..0d0e85b 100644
--- a/macros.in
+++ b/macros.in
@@ -18,6 +18,11 @@
 
 %_host %{_host_cpu}-%{_real_vendor}-%{_host_os}
 
+# %_host_cpu32 is used instead of %_host_cpu when run through linux32
+# (cf patch rpm-4.4.8-use_host_cpu32-when-linux32.patch in rpm)
+# (nb: %_host_cpu is set by /usr/lib/rpm/macros)
+@HOST_CPU32_MACRO@
+
 #==============================================================================
 # Macro naming conventions (preliminary):
 #