churchyard / rpms / python3

Forked from rpms/python3 3 years ago
Clone

Blame 00274-fix-arch-names.patch

29530ba
From c827bec294a7fb9481a55c1f7d78e80007e38816 Mon Sep 17 00:00:00 2001
285f554
From: Petr Viktorin <pviktori@redhat.com>
285f554
Date: Mon, 28 Aug 2017 17:16:46 +0200
29530ba
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
29530ba
 to match Fedora
285f554
MIME-Version: 1.0
285f554
Content-Type: text/plain; charset=UTF-8
285f554
Content-Transfer-Encoding: 8bit
d8428d8
285f554
Co-authored-by: Petr Viktorin <pviktori@redhat.com>
285f554
Co-authored-by: Miro HronĨok <miro@hroncok.cz>
285f554
Co-authored-by: Tomas Orsava <torsava@redhat.com>
d8428d8
---
d8428d8
 config.sub   |  2 +-
d8428d8
 configure.ac | 16 ++++++++--------
d8428d8
 2 files changed, 9 insertions(+), 9 deletions(-)
d8428d8
0c391af
diff --git a/config.sub b/config.sub
285f554
index ba37cf99e2..52a9ec6662 100755
0c391af
--- a/config.sub
0c391af
+++ b/config.sub
d8428d8
@@ -1045,7 +1045,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
29530ba
index 42d17bc0ad..637a99f159 100644
0c391af
--- a/configure.ac
0c391af
+++ b/configure.ac
a292838
@@ -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__)
a292838
@@ -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
a292838
@@ -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
d8428d8
 # elif defined(__or1k__)
d8428d8
         or1k-linux-gnu
d8428d8
 # elif defined(__powerpc__) && defined(__SPE__)
d8428d8
-        powerpc-linux-gnuspe
d8428d8
+        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__)
d8428d8
-        powerpc-linux-gnu
d8428d8
+        ppc-linux-gnu
d8428d8
 # elif defined(__s390x__)
d8428d8
         s390x-linux-gnu
d8428d8
 # elif defined(__s390__)
d8428d8
-- 
285f554
2.21.0
d8428d8