Fix build failure on SuperH, bug 262359.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

5 files changed, 39 insertions, 11 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 3872850b7252..f25c99ca0b31 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.240 2009/03/31 04:52:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.241 2009/04/04 20:57:58 ulm Exp $
+
+  04 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-23.0.92-sh.patch, emacs-cvs-23.0.92.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  Add __sh__ to the garbage collector conditional in gnu-linux.h. Turn off
+  optimisation on sh, in order to fix the build failure of bug 262359.
 
 *emacs-cvs-23.0.92 (31 Mar 2009)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index b20c7f4914bd..30477be6069c 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX emacs-23.0.92-sh.patch 446 RMD160 b1a3ee15e5f690a8c4f5a1d0740aae6d65e61513 SHA1 1ac571ac9a47d9ce4583c8cb6745fa7646d8e621 SHA256 e609f84435f3e22daa013262078f6cc7875664f895f0edd9a73b55fcb38ab888
 DIST emacs-23.0.90.tar.gz 42816900 RMD160 59f151e19ee555a5173a9d37829ba379043dd7e0 SHA1 25ef0fe0f37e9e13cdbc684c9cebd3863ce20ab4 SHA256 0afb69a3996455c0883909fd1f9db786d0485eed9ef44c12bd623dff2ec7c7af
 DIST emacs-23.0.91.tar.gz 43011675 RMD160 dd0f93a06d3f1179d96ec32a91866ba4dadc4a27 SHA1 47df77669910c82eb1ef60d827235f11a486c2de SHA256 d0915f56a3c68090687d22a6f8d94f0e6edbf92c3600c746b512439863bf39fd
 DIST emacs-23.0.92.tar.gz 43022949 RMD160 f7f4a14d01f2470a3278035a9587f825de149b48 SHA1 d3032a3a1ac4b9a22fa127051c8dfe188bea13f4 SHA256 53af89e1c80928130469da94f7acecbe3d663546432cfee8233568ed9e3ba7aa
 EBUILD emacs-cvs-23.0.90.ebuild 8886 RMD160 c105ad9c4057e56f579456ef429c43e2650d96d6 SHA1 c1b05e5a7a136607d75d166658aef10444ee4ab6 SHA256 2a274195fad1c9ac3c1387c5ad5415d0c28e6d0074e6f691468369de959c9060
 EBUILD emacs-cvs-23.0.91.ebuild 8886 RMD160 e1471f3a4f613660ba22e8dcf4e3adb8562c77b6 SHA1 d555ba5a2cc61e80ef628bc4aa57320c6a92417d SHA256 1509f6c55f0d2de72129e14a666f06db6977f2431e117d4aa6bebe07bbe835c6
-EBUILD emacs-cvs-23.0.92.ebuild 8886 RMD160 c43c52c83fb41dc8b7896c958ebccd725d3ed8f5 SHA1 3515a439d018730e260dd37f9e61e5f99b065781 SHA256 c6d4b4bddbdca1f60e82c4a5369b338f92314e1ca73ce7bccff660eedf691d32
-EBUILD emacs-cvs-23.0.9999-r1.ebuild 8891 RMD160 1bb01e2abf99345efb1fbec6d71eef95def621c7 SHA1 91d6c42008b0bdc6f0094fa09592fb5151ed7353 SHA256 e3786c948e1cd3a5f7dc87c11e973d35b0c9ebff7e165dec1530cc1b16f84847
-MISC ChangeLog 44887 RMD160 2306ac4bcb693994768a7e56d3a946b1a8369dcf SHA1 896f389ef54f1e6e8402d228cb2d11663afd24e8 SHA256 16309eb1159d3b8785f8a25583247bffb7ecb83ae490dcd599afa692583f32b3
+EBUILD emacs-cvs-23.0.92.ebuild 9003 RMD160 b778ae8fa58dc5c00b2388d00dfe69c7d3879f9b SHA1 0ca0aabed48a0328082ec9cb503f458f6bd1748e SHA256 23aa772668dda485bdc7374932aaa322ee939e1d90a6f0c819090bf4ea4d7ee3
+EBUILD emacs-cvs-23.0.9999-r1.ebuild 8956 RMD160 4c581d3ac7a8ba109900920b512af55b3e3ac678 SHA1 f788c85f0a041fba1d33d0f65ddd4e12d17015f6 SHA256 e0243b7ce1d9cef35b3ca4663c9bfb161ad87b9d4373b8dff825546976835f8d
+MISC ChangeLog 45173 RMD160 a78db3cdbc3ad82ad04b3a18693ecafaba3be32c SHA1 f6b34379256c82fe83f65be7135b4c4c42252d3e SHA256 ae32de9d6c1352be3b19b642b925fa8aa4dac2800bf6ba0314390bcf3d73bd01
 MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknRoewACgkQOeoy/oIi7uyKkwCfbvNeDl8RnU/BCOYuGN9b4Z99
-ENQAoNw+Zt+TgowkgWMEVyGl46n+ze3J
-=EoOz
+iEYEARECAAYFAknXyi8ACgkQOeoy/oIi7uzUawCfR6OGPnVF4dqQeZ2dKbZOoGhL
+FcQAoJH+RRa0kKQerjsF0VZn3eyxeU0K
+=1wn2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild
index 43f2b3d10252..4f8cdfb446a1 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild,v 1.1 2009/03/31 04:52:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.92.ebuild,v 1.2 2009/04/04 20:57:58 ulm Exp $
 
 EAPI=2
 
@@ -93,6 +93,8 @@ src_prepare() {
 		echo
 	fi
 
+	epatch "${FILESDIR}/emacs-${PV}-sh.patch" #262359
+
 	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
 		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
 		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
@@ -118,7 +120,11 @@ src_configure() {
 	ALLOWED_FLAGS=""
 	strip-flags
 	#unset LDFLAGS
-	replace-flags -O[3-9] -O2
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	else
+		replace-flags -O[3-9] -O2
+	fi
 
 	local myconf
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
index b11681faef28..651551a26ccf 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.6 2009/03/26 20:25:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild,v 1.7 2009/04/04 20:57:58 ulm Exp $
 
 EAPI=2
 
@@ -118,7 +118,11 @@ src_configure() {
 	ALLOWED_FLAGS=""
 	strip-flags
 	#unset LDFLAGS
-	replace-flags -O[3-9] -O2
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	else
+		replace-flags -O[3-9] -O2
+	fi
 
 	local myconf
 
diff --git a/app-editors/emacs-cvs/files/emacs-23.0.92-sh.patch b/app-editors/emacs-cvs/files/emacs-23.0.92-sh.patch
new file mode 100644
index 000000000000..d3f20fd8581d
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-23.0.92-sh.patch
@@ -0,0 +1,11 @@
+--- emacs-orig/src/s/gnu-linux.h
++++ emacs/src/s/gnu-linux.h
+@@ -258,7 +258,7 @@
+ #if defined __i386__ || defined __sparc__ || defined __mc68000__ \
+     || defined __alpha__ || defined __mips__ || defined __s390__ \
+     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
+-    || defined __ia64__
++    || defined __ia64__ || defined __sh__
+ #define GC_SETJMP_WORKS 1
+ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+ #ifdef __mc68000__