churchyard / rpms / python3

Forked from rpms/python3 2 years ago
Clone
a26287
From 6fa351057216fe2ce43ea6f509f40a63050a0684 Mon Sep 17 00:00:00 2001
285f55
From: Petr Viktorin <pviktori@redhat.com>
285f55
Date: Mon, 28 Aug 2017 17:16:46 +0200
29530b
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
29530b
 to match Fedora
285f55
MIME-Version: 1.0
285f55
Content-Type: text/plain; charset=UTF-8
285f55
Content-Transfer-Encoding: 8bit
d8428d
285f55
Co-authored-by: Petr Viktorin <pviktori@redhat.com>
285f55
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
285f55
Co-authored-by: Tomas Orsava <torsava@redhat.com>
d8428d
---
d8428d
 config.sub   |  2 +-
d8428d
 configure.ac | 16 ++++++++--------
d8428d
 2 files changed, 9 insertions(+), 9 deletions(-)
d8428d
0c391a
diff --git a/config.sub b/config.sub
285f55
index ba37cf99e2..52a9ec6662 100755
0c391a
--- a/config.sub
0c391a
+++ b/config.sub
e702ad
@@ -1042,7 +1042,7 @@ case $basic_machine in
0c391a
 		;;
0c391a
 	ppc64)	basic_machine=powerpc64-unknown
0c391a
 		;;
0c391a
-	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
0c391a
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
0c391a
 		;;
0c391a
 	ppc64le | powerpc64little)
0c391a
 		basic_machine=powerpc64le-unknown
0c391a
diff --git a/configure.ac b/configure.ac
8d46a8
index a13be153fa..edf17032b8 100644
0c391a
--- a/configure.ac
0c391a
+++ b/configure.ac
a29283
@@ -741,9 +741,9 @@ cat >> conftest.c <
9423d3
         alpha-linux-gnu
9423d3
 # elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
9423d3
 #  if defined(__ARMEL__)
9423d3
-        arm-linux-gnueabihf
9423d3
+        arm-linux-gnueabi
9423d3
 #  else
9423d3
-        armeb-linux-gnueabihf
9423d3
+        armeb-linux-gnueabi
9423d3
 #  endif
9423d3
 # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
9423d3
 #  if defined(__ARMEL__)
a29283
@@ -783,7 +783,7 @@ cat >> conftest.c <
9423d3
 #  elif _MIPS_SIM == _ABIN32
9423d3
         mips64el-linux-gnuabin32
9423d3
 #  elif _MIPS_SIM == _ABI64
9423d3
-        mips64el-linux-gnuabi64
9423d3
+        mips64el-linux-gnu
9423d3
 #  else
9423d3
 #   error unknown platform triplet
9423d3
 #  endif
a29283
@@ -793,22 +793,22 @@ cat >> conftest.c <
9423d3
 #  elif _MIPS_SIM == _ABIN32
9423d3
         mips64-linux-gnuabin32
9423d3
 #  elif _MIPS_SIM == _ABI64
9423d3
-        mips64-linux-gnuabi64
9423d3
+        mips64-linux-gnu
9423d3
 #  else
9423d3
 #   error unknown platform triplet
9423d3
 #  endif
d8428d
 # elif defined(__or1k__)
d8428d
         or1k-linux-gnu
d8428d
 # elif defined(__powerpc__) && defined(__SPE__)
d8428d
-        powerpc-linux-gnuspe
d8428d
+        ppc-linux-gnuspe
9423d3
 # elif defined(__powerpc64__)
9423d3
 #  if defined(__LITTLE_ENDIAN__)
9423d3
-        powerpc64le-linux-gnu
9423d3
+        ppc64le-linux-gnu
9423d3
 #  else
9423d3
-        powerpc64-linux-gnu
9423d3
+        ppc64-linux-gnu
9423d3
 #  endif
9423d3
 # elif defined(__powerpc__)
d8428d
-        powerpc-linux-gnu
d8428d
+        ppc-linux-gnu
d8428d
 # elif defined(__s390x__)
d8428d
         s390x-linux-gnu
d8428d
 # elif defined(__s390__)
d8428d
-- 
a26287
2.24.1
d8428d