Added patch to fix linking problems on amd64. This fixes bug #166521.

Package-Manager: portage-2.1.2.2

4 files changed, 50 insertions, 11 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index b2120c5f4070..704670ab50fe 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.34 2007/03/01 23:10:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.35 2007/03/20 13:11:47 markusle Exp $
+
+  20 Mar 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/scilab-4.1-java-pic.patch, scilab-4.1.ebuild:
+  Added patch to fix linking problems on amd64. 
+  This fixes bug #166521.
 
   01 Mar 2007; Markus Dittrich <markusle@gentoo.org>
   -files/gzvt2-add-gtk2-flags.patch, -scilab-3.1.1-r3.ebuild,
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 23d19bff1016..bab7d2070c85 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -22,6 +22,10 @@ AUX scilab-4.1-header-fix.patch 3661 RMD160 f38f39a9332f4e27952bed1ccd772468f28f
 MD5 8f4c8235bf0d5812f1e4ec748f46fae0 files/scilab-4.1-header-fix.patch 3661
 RMD160 f38f39a9332f4e27952bed1ccd772468f28fd492 files/scilab-4.1-header-fix.patch 3661
 SHA256 c84b109e4ca58645d958542eaf9fce77a58ef76f26c03b038fb89642d8a47766 files/scilab-4.1-header-fix.patch 3661
+AUX scilab-4.1-java-pic.patch 1604 RMD160 cae9bd8923f69af53ef11de0301323d8964e135a SHA1 f50f90b0e66a8dbfa7abbfdb2b2d9882004ee32b SHA256 eab86feade8002a9edf2701b820847420b1ade7bcf96bb909e2a09b39850dd91
+MD5 835a377fad618813b876945be09f433b files/scilab-4.1-java-pic.patch 1604
+RMD160 cae9bd8923f69af53ef11de0301323d8964e135a files/scilab-4.1-java-pic.patch 1604
+SHA256 eab86feade8002a9edf2701b820847420b1ade7bcf96bb909e2a09b39850dd91 files/scilab-4.1-java-pic.patch 1604
 AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a
 MD5 d64e32c9d98d776a5bdce28e6044cff4 files/scilab-ppc-gcc4.patch 1045
 RMD160 db4219fc04b5555e702d823425735125f3000c00 files/scilab-ppc-gcc4.patch 1045
@@ -32,14 +36,14 @@ EBUILD scilab-4.0.ebuild 3928 RMD160 befd51d58ed4e83c4335af6a07639c78bf9a1e0f SH
 MD5 9066a9478dc6c30c475dac4ec06a3539 scilab-4.0.ebuild 3928
 RMD160 befd51d58ed4e83c4335af6a07639c78bf9a1e0f scilab-4.0.ebuild 3928
 SHA256 7366a325352b38ea99483b25702f85840b6b8e25a8e8b583644618c6bfa0bb09 scilab-4.0.ebuild 3928
-EBUILD scilab-4.1.ebuild 4341 RMD160 9f9736d31cd1aecde23ba835d279733875ea39f4 SHA1 3ec79e3fbd91488767d0c9082799962b11cf9f9b SHA256 140c74de8d26f98962315a92a629513257ead1e2d5db24b93b1d72129742b45e
-MD5 4bcf05bcc584c87703513c0c2c213692 scilab-4.1.ebuild 4341
-RMD160 9f9736d31cd1aecde23ba835d279733875ea39f4 scilab-4.1.ebuild 4341
-SHA256 140c74de8d26f98962315a92a629513257ead1e2d5db24b93b1d72129742b45e scilab-4.1.ebuild 4341
-MISC ChangeLog 9203 RMD160 b9f279f230939a0fe10d5ab04c9e6f4d05030dbf SHA1 a590867d50a760834eef1ccc619d6f1dbce45a31 SHA256 f4484ac494349f2268ce37cc63ef0c55f7dfd20dfd4dc8f82e52c419616bf526
-MD5 af3c90c61a6f0ac6b1326b18012f2a68 ChangeLog 9203
-RMD160 b9f279f230939a0fe10d5ab04c9e6f4d05030dbf ChangeLog 9203
-SHA256 f4484ac494349f2268ce37cc63ef0c55f7dfd20dfd4dc8f82e52c419616bf526 ChangeLog 9203
+EBUILD scilab-4.1.ebuild 4336 RMD160 0441ff076df58dd58fb8fc050ace09c0c783ce33 SHA1 9bd4455846d8a042320d8d1c1543f47afeb73efb SHA256 0fe30640f4cc0ac68243f6e0caaaa70fe1ed38b1ebea2468878f88765346311f
+MD5 849365b99a1fdb1e89a8ffda0615aeef scilab-4.1.ebuild 4336
+RMD160 0441ff076df58dd58fb8fc050ace09c0c783ce33 scilab-4.1.ebuild 4336
+SHA256 0fe30640f4cc0ac68243f6e0caaaa70fe1ed38b1ebea2468878f88765346311f scilab-4.1.ebuild 4336
+MISC ChangeLog 9387 RMD160 73b50569884396884e24cc7f345427c6f12ebe96 SHA1 30d6d2a16ac13b9d40c418e0069275ae17788338 SHA256 f21491043ed53ce2c9ce622c1b340b5bce324f0f10f0a525fe5a26524498315a
+MD5 6df1d683528bef2b6b561a2572470034 ChangeLog 9387
+RMD160 73b50569884396884e24cc7f345427c6f12ebe96 ChangeLog 9387
+SHA256 f21491043ed53ce2c9ce622c1b340b5bce324f0f10f0a525fe5a26524498315a ChangeLog 9387
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
diff --git a/sci-mathematics/scilab/files/scilab-4.1-java-pic.patch b/sci-mathematics/scilab/files/scilab-4.1-java-pic.patch
new file mode 100644
index 000000000000..411c29c06be4
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-4.1-java-pic.patch
@@ -0,0 +1,30 @@
+diff -Naur scilab-4.1.old/routines/Javasci/Makefile.in scilab-4.1/routines/Javasci/Makefile.in
+--- scilab-4.1.old/routines/Javasci/Makefile.in	2006-07-19 05:08:44.000000000 -0400
++++ scilab-4.1/routines/Javasci/Makefile.in	2007-03-11 14:09:00.000000000 -0400
+@@ -13,7 +13,7 @@
+ OBJSC=  javasci_SciStringArray.o javasci_globals.o javasci_Scilab.o javasci_Scilab2.o javasci_SciDoubleArray.o javasci_SciComplexArray.o @GCCFIX@
+ OBJSF =
+ OBJS = $(OBJSC)
+-CFLAGS = $(CC_OPTIONS) $(JAVAINC)
++CFLAGS = $(CC_OPTIONS) -fPIC $(JAVAINC)
+ FLIBS=@FLIBS@
+ 
+ include ../../Makefile.incl
+diff -Naur scilab-4.1.old/routines/Javasci/Makefile.linux scilab-4.1/routines/Javasci/Makefile.linux
+--- scilab-4.1.old/routines/Javasci/Makefile.linux	2005-05-23 07:22:17.000000000 -0400
++++ scilab-4.1/routines/Javasci/Makefile.linux	2007-03-11 14:09:17.000000000 -0400
+@@ -4,4 +4,4 @@
+ 	@echo Creation of $(LIBRARY)
+ 	@$(RM) $@;
+ 	@echo "linking";
+-	@$(FC) -Wl,-shared -g -o $@ $(OBJS) $(DEFAULTS) $(LIBR) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
++	$(CC) -shared -o $@ $(OBJS) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
+diff -Naur scilab-4.1.old/routines/Javasci/Makefile.linux64 scilab-4.1/routines/Javasci/Makefile.linux64
+--- scilab-4.1.old/routines/Javasci/Makefile.linux64	2006-06-13 10:14:49.000000000 -0400
++++ scilab-4.1/routines/Javasci/Makefile.linux64	2007-03-11 14:09:51.000000000 -0400
+@@ -4,4 +4,4 @@
+ 	@echo Creation of $(LIBRARY)
+ 	@$(RM) $@;
+ 	@echo "linking";
+-	@$(FC) -shared -g -o $@ $(OBJS) $(DEFAULTS) $(LIBR) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
++	$(CC) -shared -o $@ $(OBJS) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
diff --git a/sci-mathematics/scilab/scilab-4.1.ebuild b/sci-mathematics/scilab/scilab-4.1.ebuild
index a711be2e882f..f49637a44125 100644
--- a/sci-mathematics/scilab/scilab-4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.ebuild,v 1.3 2007/03/01 23:10:55 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.ebuild,v 1.4 2007/03/20 13:11:47 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
@@ -57,7 +57,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-4.0-makefile.patch
-	epatch "${FILESDIR}"/${PN}-4.0-java-pic.patch
+	epatch "${FILESDIR}"/${P}-java-pic.patch
 	epatch "${FILESDIR}"/${P}-header-fix.patch
 	epatch "${FILESDIR}"/${P}-examples.patch