Drop sysfsutils dep as it appears to be unused (builds fine w/out it) #377699 by Anthony Basile. Add fix from upstream for building on s390 with newer binutils #391433 by Raúl Porcel.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 80 insertions, 7 deletions

diff --git a/sys-apps/s390-tools/ChangeLog b/sys-apps/s390-tools/ChangeLog
index eea7ed943f0c..30a80eca7e1f 100644
--- a/sys-apps/s390-tools/ChangeLog
+++ b/sys-apps/s390-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/s390-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.27 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/ChangeLog,v 1.28 2011/12/05 19:05:33 vapier Exp $
+
+  05 Dec 2011; Mike Frysinger <vapier@gentoo.org> s390-tools-1.13.0.ebuild,
+  +files/s390-tools-1.13.0-larl.patch, s390-tools-1.15.0.ebuild:
+  Drop sysfsutils dep as it appears to be unused (builds fine w/out it) #377699
+  by Anthony Basile. Add fix from upstream for building on s390 with newer
+  binutils #391433 by Raúl Porcel.
 
 *s390-tools-1.15.0 (20 Nov 2011)
 
diff --git a/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch b/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
new file mode 100644
index 000000000000..7bf6cf41e94c
--- /dev/null
+++ b/sys-apps/s390-tools/files/s390-tools-1.13.0-larl.patch
@@ -0,0 +1,67 @@
+https://bugs.gentoo.org/391433
+
+You reported a zipl build problem for 31 bit:
+http://marc.info/?l=linux-s390&m=132307473025493&w=2
+
+The following patch (for s390-tools-1.15.0) should fix this problem:
+---
+From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+Subject: zipl: Do not use larl for 31 bit code
+
+The larl instruction is not available for pre z900 machines in 31 bit mode.
+In order to be able to compile zipl also for that machines, with this
+patch the larl instruction is replaced by instructions that work on
+older machines.
+
+Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
+---
+ zipl/boot/dumpcommon.S |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/zipl/boot/dumpcommon.S
++++ b/zipl/boot/dumpcommon.S
+@@ -1005,7 +1005,7 @@ _count_mem_32:
+         mr    %r2,%r1                   # mem size in bytes in %r3
+ 
+         st    %r3,.Ldh_real_mem_size+4-0b(%r13)
+-        larl  %r7,.Lmem_upper_limit+4
++        l     %r7,.Lmem_upper_limit_addr-0b(%r13)
+         l     %r6,0(%r7)                     # check if we have an upper limit
+         clr   %r3,%r6
+         bl    .Lsavemem-0b(%r13)
+@@ -1018,13 +1018,15 @@ _count_mem_32:
+ 
+         clr   %r6,%r3
+         bne   .Lexit-0b(%r13)
+-        larl  %r2,.Lmsg_mem_limit_set          # print mem limit warning
++        la    %r2,.Lmsg_mem_limit_set-0b(%r13) # print mem limit warning
+         bras  %r14,_sclp_print
+ .Lexit:
+         lm    %r6,%r15,120(%r15)
+         br    %r14
+ .Lonemb:
+         .int 0x100000
++.Lmem_upper_limit_addr:
++	.long	.Lmem_upper_limit+4
+ 
+ 
+ # expand Macros
+
+> it fixes most of them, but seems there's still one left :)
+
+Ok, try this one:
+---
+ zipl/boot/tapedump.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/zipl/boot/tapedump.S
++++ b/zipl/boot/tapedump.S
+@@ -532,7 +532,7 @@ _dump_mem_32:
+         # Cartridge full
+ 
+         la    %r2,EMEM
+-        larl  %r14,_panik_32
++        l     %r14,.Lpanik_32-0b(%r13)
+         basr  %r14,%r14
+ 
+ 1:      # All memory written
diff --git a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
index f5b7871bda88..cf8a3ebb8529 100644
--- a/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.13.0.ebuild,v 1.2 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.13.0.ebuild,v 1.3 2011/12/05 19:05:33 vapier Exp $
 
 EAPI="2"
 
@@ -23,8 +23,7 @@ SLOT="0"
 KEYWORDS="-* s390"
 IUSE="fuse snmp zfcpdump"
 
-RDEPEND="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse )
 	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
@@ -32,6 +31,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.13.0-build.patch
+	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
 
 	use snmp || sed -i -e 's:osasnmpd::' Makefile
 	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }
diff --git a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
index 30e78b019c30..968cf0c69218 100644
--- a/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-1.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.15.0.ebuild,v 1.1 2011/11/20 06:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/s390-tools/s390-tools-1.15.0.ebuild,v 1.2 2011/12/05 19:05:33 vapier Exp $
 
 EAPI="2"
 
@@ -23,8 +23,7 @@ SLOT="0"
 KEYWORDS="-* ~s390"
 IUSE="fuse snmp zfcpdump"
 
-RDEPEND="sys-fs/sysfsutils
-	fuse? ( sys-fs/fuse )
+RDEPEND="fuse? ( sys-fs/fuse )
 	snmp? ( net-analyzer/net-snmp )"
 DEPEND="${RDEPEND}
 	dev-util/indent
@@ -32,6 +31,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.13.0-build.patch
+	epatch "${FILESDIR}"/${PN}-1.13.0-larl.patch #391433
 
 	use snmp || sed -i -e 's:osasnmpd::' Makefile
 	use fuse || { sed -i -e 's:cmsfs-fuse::' Makefile; export WITHOUT_FUSE=1; }