summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-06-24 16:09:15 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-06-24 16:09:15 +0000
commit1cf985449022fc69f55d36e70478ddfa264ec729 (patch)
treeacbcdeef5b26742566c0e345c35e629d38fdce80 /sci-mathematics
parentFix for glibc-2.11, fix for bug 315595 (diff)
downloadhistorical-1cf985449022fc69f55d36e70478ddfa264ec729.tar.gz
historical-1cf985449022fc69f55d36e70478ddfa264ec729.tar.bz2
historical-1cf985449022fc69f55d36e70478ddfa264ec729.zip
Fix build with GCC-4.5 wrt bug 321209. Thanks Diego for reporting.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/scilab/ChangeLog6
-rw-r--r--sci-mathematics/scilab/Manifest13
-rw-r--r--sci-mathematics/scilab/files/scilab-4.1.2-gcc45.patch27
-rw-r--r--sci-mathematics/scilab/scilab-4.1.2-r2.ebuild5
4 files changed, 43 insertions, 8 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 3e50c1c7cc08..2b8f4ffe164c 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/scilab
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.48 2010/06/22 12:50:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.49 2010/06/24 16:09:15 xarthisius Exp $
+
+ 24 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ scilab-4.1.2-r2.ebuild, +files/scilab-4.1.2-gcc45.patch:
+ Fix build with GCC-4.5 wrt bug 321209. Thanks Diego for reporting.
22 Jun 2010; Justin Lecher <jlec@gentoo.org> -scilab-4.0.ebuild:
Removed broken version, #147900 & #155893
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index d48d81761885..3daf9d319dad 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -8,19 +8,22 @@ AUX scilab-4.0-makefile.patch 1190 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0c
AUX scilab-4.1-examples.patch 7399 RMD160 a026a9c0e585a74f9cb3d434e67f3375e5fa4f6a SHA1 19326db03cf4a4a26d3b8448d9c663a3d774d247 SHA256 99b49abc82d9a881c7d8d15c2ca8fec678ddb8b9efedc2ec3347f6156886716d
AUX scilab-4.1-header-fix.patch 4145 RMD160 60225f4905f2be454bf2c1c72d4a5727e6295749 SHA1 717017dcd6a0eb25facff0ded30bdb0c2db98522 SHA256 aa1ab5bd1b0c261268191b3b47e52ddee8b5642222806b8813a97dd16e1cc3b0
AUX scilab-4.1-java-pic.patch 1604 RMD160 cae9bd8923f69af53ef11de0301323d8964e135a SHA1 f50f90b0e66a8dbfa7abbfdb2b2d9882004ee32b SHA256 eab86feade8002a9edf2701b820847420b1ade7bcf96bb909e2a09b39850dd91
+AUX scilab-4.1.2-gcc45.patch 668 RMD160 ee01d732636c4ce69f0409a9d5e84dc5843bf281 SHA1 98003edd07a34512d8b4e2d57426c4ac2420ab7d SHA256 391d03173c866815a12e9a01f15e57c550b36f0b4a4eca5147caabfdc185b42b
AUX scilab-4.1.2-header-fix.patch 4240 RMD160 33941b2da653b0b4579fc6e3e01a55f2b87248a4 SHA1 24a7946359679785634257ae9bfd8fe03b5c5eea SHA256 1f103b1e08068cd9c813dd5f0f067ab0430ff6a4e608603fd2bf1f07adc5556b
AUX scilab-4.1.2-java-config.patch 446 RMD160 300d2ac4d0bf34e5842696644735af78c6b579d4 SHA1 61656b20211e3a345c2fe42e05471324355961ac SHA256 650cb6dcce4a7883318cd553140516ced6ab32dc325eb1c56a013df272e3fd0f
AUX scilab-4.1.2-tmp-fix.patch 6067 RMD160 63f217f41edb721d1717724931410c228ad92dd9 SHA1 9a4856ce02c47d4bbcbffeb449d0861bb13dedf2 SHA256 b25b46e0738b2f37d8333128dc32d2f40358e0a217615f65b5e5811c423e336f
AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a
DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
EBUILD scilab-4.1.2-r1.ebuild 4349 RMD160 079ab5e749528dd1dee8b90be89d8a3c6bbaf9f3 SHA1 7247024c59212174adba9ad843a4ef8945a03cc2 SHA256 00016e4e4937ca216a118dae53445a22cc47dd138840b06c24f92d6b6dfedc39
-EBUILD scilab-4.1.2-r2.ebuild 4580 RMD160 7a2530edb494c4ede31243b02940ef774e5cf0e4 SHA1 84afda9eeba75f63b731266e0d89de97b9a809e5 SHA256 b34455a7b3ba9a66750f9c7bdfb4e72a496d71119831a22bf2ef7abf82d5e367
-MISC ChangeLog 11516 RMD160 4aead41e470de582547a093da8ae1d1306a8ebe1 SHA1 bf0d41f921e3ceb89760bf9ce097961f8093b1ec SHA256 b76c953ada9c139b068b3f448ec2bb47de759fccd7e793d1713fd6d77c4d262d
+EBUILD scilab-4.1.2-r2.ebuild 4621 RMD160 f9642f4f9fd5d9e20da469c3a6ced16f01f6d01f SHA1 4ec472d7d1f3f85c06dd56f756eff374ca20ad0d SHA256 b0322daa531eb4d72609aacb1480a25c32925ddac74c92ebea0fb19053709276
+MISC ChangeLog 11705 RMD160 c7205e64af3f15b98be0b43b5306e08333e04ac4 SHA1 81014781d8bd3bd313e54428bac316e3040783b1 SHA256 aed46aaa68b920339c93644533f83db4d1a1edd3ad26cb1ed7a639144e0e0192
MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwgsaIACgkQgAnW8HDreRa2oACgi9yl31+OEjpFLjYvwOov3JAg
-RRIAn2b2sTyyTYxCJB07bvF3LEACb659
-=Xgks
+iJwEAQECAAYFAkwjgzUACgkQIiMqcbOVdxSongP/XU1qgz7us8COAcpwyOvJcCLF
+sEgzMNSjWoDQdvFLLCPUFOb5V+HOmUaJRLWqPXtGNNs8yAnxcMPxmigcUtgg5dhC
+PAcN2eIv47K8p3U40knqteFBisNuLgUOlu3H/KhS5ZT0EYKcAbDdEWXlwN78Nkqw
+pBCSwA8druMf2iDzIYE=
+=wRFG
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/scilab/files/scilab-4.1.2-gcc45.patch b/sci-mathematics/scilab/files/scilab-4.1.2-gcc45.patch
new file mode 100644
index 000000000000..d256625a6765
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-4.1.2-gcc45.patch
@@ -0,0 +1,27 @@
+Fixing build with gcc 4.5.
+
+http://bugs.gentoo.org/show_bug.cgi?id=321209
+
+--- routines/system/msgs.f
++++ routines/system/msgs.f
+@@ -82,7 +82,7 @@
+ call showstack()
+ goto 9999
+ 109 continue
+- write(buf(1:5),'(1pI5)') ierr
++ write(buf(1:5),'(I5)') ierr
+ call basout(io, wte, 'rank defficient. rank = '//buf(1:5))
+ goto 9999
+ 110 continue
+--- routines/system/Makefile.in
++++ routines/system/Makefile.in
+@@ -41,6 +41,9 @@
+ getsym.o: getsym.f
+ $(FC) @FC_OPTIONS2@ -c getsym.f -o getsym.o
+
++algebre.o: algebre.f
++ $(FC) $(FC_OPTIONS) -fno-range-check -c $< -o $@
++
+ allops.o: ../stack.h
+ bexec.o: ../stack.h
+ clause.o: ../stack.h
diff --git a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
index 1ea6f2019656..3e052f8fe68e 100644
--- a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.1 2009/08/10 13:41:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.2 2010/06/24 16:09:15 xarthisius Exp $
inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
@@ -49,6 +49,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-4.1-examples.patch
epatch "${FILESDIR}"/${P}-java-config.patch
epatch "${FILESDIR}"/${P}-tmp-fix.patch
+ epatch "${FILESDIR}"/${P}-gcc45.patch
eautoconf
sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \