From bb4a5dd108fde7118664b092718fdf96d19f6e66 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Sat, 4 May 2019 17:11:01 +0000
Subject: Make armv7hl chroots on aarch64 work as expected

set arch_compat so that urpmi accepts to install armv7hl packages
and set canonical architecture to be armv7hl
---
 NEWS         | 3 +++
 configure.ac | 3 +++
 rpmrc.in     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 93a4bf2..dc4ca0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- make armv7hl chroots on aarch64 work as expected (urpmi accepts to install armv7hl
+  packages and default rpm build target is armv7hl)
+
 Version 2.38 - 11 March 2019, by Thierry Vignaud
 
 - add %_metainfodir macro for appdata metainfo dir
diff --git a/configure.ac b/configure.ac
index 1d02040..4dfaf6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_CHECK_HEADERS([string.h])
 CANONTARGETCPU=${target_cpu}
 CANONTARGETGNU=-gnu
 ARMV7CANONTARGETCPU="armv5tl"
+ARMV8CANONTARGETCPU="armv8l"
 
 case "${target_cpu}" in
     *86|athlon|k6|pentium*) 
@@ -101,6 +102,7 @@ case "${target_cpu}" in
     CANONTARGETCPU=armv7hl
     CANONTARGETGNU=-gnueabi
     ARMV7CANONTARGETCPU="armv7hl"
+    ARMV8CANONTARGETCPU="armv7hl"
 esac
 RPMALLARCH="${RPMALLARCH} noarch"
 AC_SUBST(RPMALLARCH)
@@ -108,6 +110,7 @@ AC_SUBST(CANONTARGETCPU)
 AC_SUBST(CANONTARGETCPU32)
 AC_SUBST(CANONTARGETGNU)
 AC_SUBST(ARMV7CANONTARGETCPU)
+AC_SUBST(ARMV8CANONTARGETCPU)
 
 #
 # get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
diff --git a/rpmrc.in b/rpmrc.in
index e5864c1..32f5695 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -109,6 +109,7 @@ buildarchtranslate: armv7: armv5t
 buildarchtranslate: armv7l: @ARMV7CANONTARGETCPU@
 buildarchtranslate: armv7hl: armv7hl
 buildarchtranslate: armv7hnl: armv7hl
+buildarchtranslate: armv8l: @ARMV8CANONTARGETCPU@
 
 #############################################################
 # Architecture compatibility
@@ -120,6 +121,8 @@ arch_compat: osfmach3_i586: i586 osfmach3_i486
 arch_compat: osfmach3_i486: i486 osfmach3_i386
 arch_compat: osfmach3_i386: i486
 
+arch_compat: armv8l: armv7hl
+
 buildarch_compat: k6: i486
 
 macrofiles: @RPMLIBDIR@/macros:@RPMLIBDIR@/%{_target}/macros:@RPMVENDORDIR@/macros:@RPMVENDORDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros:@RPMSYSCONFDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros.cdb:@RPMSYSCONFDIR@/macros.d/*.macros:~/.rpmmacros
-- 
cgit v1.2.1