churchyard / rpms / python38

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