rpm/automake
SHA256
1
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

Accepting request 460197 from openSUSE:Factory:zSystems

Browse Source 
change behavior of automake on s390 to match other architectures

OBS-URL: https://build.opensuse.org/request/show/460197
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=55
This commit is contained in:
Martin Pluskal 2017-02-24 15:55:45 +00:00 committed by Git OBS Bridge
parent bc8cf01229
commit 6164c2e0a1
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
automake-SuSE.patch
View File

@ -4,8 +4,8 @@
Index: lib/config.guess
===================================================================
--- lib/config.guess.orig 2015-02-10 12:01:47.557016290 +0100
+++ lib/config.guess 2015-02-10 12:05:32.791670816 +0100
--- lib/config.guess.orig
+++ lib/config.guess
@@ -153,6 +153,16 @@ Linux|GNU|GNU/*)
;;
esac
@ -290,7 +290,8 @@ Index: lib/config.guess
+ echo powerpcle-${VENDOR}-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@ -447,3 +448,28 @@ Index: lib/config.guess
exit ;;
esac
Index: lib/config.sub
===================================================================
--- lib/config.sub.orig
+++ lib/config.sub
@@ -1058,12 +1058,18 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
- s390 | s390-*)
+ s390)
basic_machine=s390-ibm
;;
- s390x | s390x-*)
+ s390-*)
+ basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ s390x)
basic_machine=s390x-ibm
;;
+ s390x-*)
+ basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi

2
automake-testsuite.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package automake-testsuite
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

5
automake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 10 07:34:09 UTC 2017 - bg@suse.com
- use vendor suse instead of IBM on s390x
-------------------------------------------------------------------
Sun Jun 26 19:13:10 UTC 2016 - mpluskal@suse.com

2
automake.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package automake
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed