Added patch to fix gcc-4.x configure/compile problems on ppc (see bug #117490).

Package-Manager: portage-2.1_pre9-r4

4 files changed, 65 insertions, 11 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 6d10a5a57338..ee05e98c4843 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.20 2006/04/25 16:52:44 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.21 2006/04/27 15:38:59 markusle Exp $
+
+  27 Apr 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/scilab-ppc-gcc4.patch, scilab-4.0.ebuild:
+  Added patch to fix gcc-4.x configure/compile problems on ppc. 
+  Thanks much to Francois Bissey <f.r.bissey@massey.ac.nz> for his 
+  help in debugging this (see bug #117490).
 
 *scilab-4.0 (25 Apr 2006)
 
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index b67602eda72b..81dc3c13c7ee 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -10,6 +10,10 @@ AUX scilab-4.0-makefile.patch 1190 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0c
 MD5 49fb9cb0862b4d8eceb2b45fb1abde18 files/scilab-4.0-makefile.patch 1190
 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0ced files/scilab-4.0-makefile.patch 1190
 SHA256 6f552482a5933103133b1e9245166a6d23478fffe57cccac2166f2889cff140f files/scilab-4.0-makefile.patch 1190
+AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a size 1045
+MD5 d64e32c9d98d776a5bdce28e6044cff4 files/scilab-ppc-gcc4.patch 1045
+RMD160 db4219fc04b5555e702d823425735125f3000c00 files/scilab-ppc-gcc4.patch 1045
+SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a files/scilab-ppc-gcc4.patch 1045
 DIST patch_browsehelp.tar.gz 622246 RMD160 74a7dbe2c01968c93e77d8dbfd4cb9c95deabc44 SHA256 b7651e6b3d33738f8fa902238f8f06b2b35bdf092b0e94ae115b26e6ea81e7cb size 622246
 DIST scilab-2.7.src.tar.gz 9510676 RMD160 80c346d102463f618336b2a1775ff27dcb4ef9a4 SHA256 45b06effc295b39cb05b8ecf342ab3f2b0c4a860fb0b1f482cd977bcb8f44607 size 9510676
 DIST scilab-3.1.1-src.tar.gz 14261772 RMD160 363486c6c9d1e64a28edcd002651e3c9d3b1eb73 SHA256 1d75ec6b9e26216b69c31a4cb648a1e7d6045e3f1305019491cc3e1846ca60e8 size 14261772
@@ -22,14 +26,14 @@ EBUILD scilab-3.1.1-r3.ebuild 4876 RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e
 MD5 88fe35577e6d544b620686c4cca653e9 scilab-3.1.1-r3.ebuild 4876
 RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e76 scilab-3.1.1-r3.ebuild 4876
 SHA256 7fdc8b7a28ea71b962d503ab8125241ed7e3ceb531cab4b1d3329510e911c03e scilab-3.1.1-r3.ebuild 4876
-EBUILD scilab-4.0.ebuild 3417 RMD160 2c0836379d3ff5c4c765828cbf23139fd3bdaf26 SHA1 d959e31c616e1af4858a3d1da270288b1f8d6fbb SHA256 d2b5352bdbc098a057e80224384c53937e5f16ac6c07671a31d9184a79806795 size 3417
-MD5 221f14005046d9d295d9c98c2615ceb4 scilab-4.0.ebuild 3417
-RMD160 2c0836379d3ff5c4c765828cbf23139fd3bdaf26 scilab-4.0.ebuild 3417
-SHA256 d2b5352bdbc098a057e80224384c53937e5f16ac6c07671a31d9184a79806795 scilab-4.0.ebuild 3417
-MISC ChangeLog 6848 RMD160 216b2201cd257e89ac1cd04c84a43fbba281971d SHA1 6d6a6f094121e277125f06a72d26b9f14c774724 SHA256 3c3a6c050e34cf1107b3de2a1fdb1128bfd4cc99cdb586ca8ad72109c4a956d4 size 6848
-MD5 299b4a90e92be1876575281a86ef3ccc ChangeLog 6848
-RMD160 216b2201cd257e89ac1cd04c84a43fbba281971d ChangeLog 6848
-SHA256 3c3a6c050e34cf1107b3de2a1fdb1128bfd4cc99cdb586ca8ad72109c4a956d4 ChangeLog 6848
+EBUILD scilab-4.0.ebuild 3689 RMD160 35a441c92d9a93f04389e37df913bd2b76ba0588 SHA1 92bde19df712dba5e9e504e1f806a79bf199a48b SHA256 2882c66c49cfc35a26f29422dd30873e34e4d4db84966b1532bf7dd8a7bff996 size 3689
+MD5 19a8a29b73bc0ee2e992bcfd013c613a scilab-4.0.ebuild 3689
+RMD160 35a441c92d9a93f04389e37df913bd2b76ba0588 scilab-4.0.ebuild 3689
+SHA256 2882c66c49cfc35a26f29422dd30873e34e4d4db84966b1532bf7dd8a7bff996 scilab-4.0.ebuild 3689
+MISC ChangeLog 7130 RMD160 7a6ee588c55084e6fc4a38fa004cf897b92cdee4 SHA1 fdf15a3f60a5f61a1cca065c7a1972465470b783 SHA256 40b2ac0d131a0b94f1ab9f2a57092a8b6cc8453b6d89de2a1c63be828a6348a9 size 7130
+MD5 8facd88ff4e636faa906ea7d5268855f ChangeLog 7130
+RMD160 7a6ee588c55084e6fc4a38fa004cf897b92cdee4 ChangeLog 7130
+SHA256 40b2ac0d131a0b94f1ab9f2a57092a8b6cc8453b6d89de2a1c63be828a6348a9 ChangeLog 7130
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-mathematics/scilab/files/scilab-ppc-gcc4.patch b/sci-mathematics/scilab/files/scilab-ppc-gcc4.patch
new file mode 100644
index 000000000000..820586638fcc
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-ppc-gcc4.patch
@@ -0,0 +1,32 @@
+--- scilab-4.0/configure.in	2006-01-27 10:13:17.000000000 -0600
++++ scilab-4.0-new/configure.in	2006-04-26 19:05:17.000000000 -0500
+@@ -894,13 +894,19 @@
+       [LIEEELIB=-lieee])
+     GCC=yes
+     CC=gcc
+-    CC_OPTIONS='-O -DNDEBUG -D_GNU_SOURCE -Dlinux -fwritable-strings'
++    CC_OPTIONS='-O -DNDEBUG -D_GNU_SOURCE -Dlinux'
+     CC_LDFLAGS=$LIEEELIB
+     CC_PICFLAGS=-fPIC
+     # find Fortran compiler
+     # g77 already asked and found: good
+     if test "$WITH_G77" = yes; then
+       FC=g77
++    elif test "$WITH_GFORTRAN" = yes;then
++      FC=gfortran
++      FC_OPTIONS="-O -ff2c"
++      FC_OPTIONS_O0="-ff2c"
++      FC_PICFLAGS=-fPIC
++      AC_DEFINE(G95_FORTRAN)
+     # option with-f2c
+     elif test "$with_f2c" = yes; then
+       AC_CHECK_PROG(F2C,f2c,yes,no)
+@@ -932,7 +938,7 @@
+     LD=ld
+     LD_LDFLAGS=$LIEEELIB
+     if test "$enable_debug" = yes; then 
+-      CC_OPTIONS='-g -Dlinux -D_GNU_SOURCE -fwritable-strings'
++      CC_OPTIONS='-g -Dlinux -D_GNU_SOURCE'
+       FC_OPTIONS=-g
+     fi
+     MAKEFILE_TARGET=Makefile.linux
diff --git a/sci-mathematics/scilab/scilab-4.0.ebuild b/sci-mathematics/scilab/scilab-4.0.ebuild
index eb3585a228fb..c7a67083c9f4 100644
--- a/sci-mathematics/scilab/scilab-4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.1 2006/04/25 14:32:04 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.2 2006/04/27 15:38:59 markusle Exp $
 
-inherit eutils fortran toolchain-funcs multilib
+inherit eutils fortran toolchain-funcs multilib autotools
 
 DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
 LICENSE="scilab"
@@ -39,6 +39,8 @@ pkg_setup() {
 		eerror 'scilab must be built with either USE="gtk" or USE="tcltk"'
 		die
 	fi
+
+	need_fortran gfortran g77
 }
 
 src_unpack() {
@@ -47,6 +49,12 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-makefile.patch
 
+	# fix gfortran problems on ppc
+	if [[ "${ARCH}" == "ppc" ]];then
+		epatch "${FILESDIR}"/${PN}-ppc-gcc4.patch
+		eautoconf || die "autoconf failed"
+	fi
+
 	sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
 		-e 's,$(SCIDIR)/libs/lapack.a,,' \
 		-i Makefile.OBJ.in || die "Failed to fix Makefile.OBJ.in"
@@ -64,6 +72,10 @@ src_compile() {
 	local myopts
 	myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)"
 
+	if [[ ${FORTRANC} == gfortran ]]; then
+		myopts="${myopts} --with-gfortran"
+	fi
+
 	econf $(use_with tcltk tk) \
 		$(use_with Xaw3d xaw3d) \
 		$(use_with gtk gtk2 ) \