[patch] Patch for compiling scilab-4.1.2-r2 with mkl-10.0.5.025 mkl-gfortran-threads, using ebuild attached to this bug.

scilab-4.1.2-mkl-10.0.5.025-libs-fix.patch (text/plain), 3.86 KB, created by Chris Larson on 2009-08-19 20:10:38 UTC

diff -Naur scilab-4.1.2/Makefile.incl.in scilab-4.1.2.new/Makefile.incl.in
--- scilab-4.1.2/Makefile.incl.in	2004-11-22 09:09:45.000000000 -0600
+++ scilab-4.1.2/Makefile.incl.in	2004-11-22 09:09:45.000000000 -0600
@@ -34,7 +34,7 @@
 CC = @CC@
 #CC_OPTIONS = @CC_OPTIONS@ @GTKCFLAGS@ @GNOMECFLAGS@
 CC_OPTIONS = @CC_OPTIONS@ @GNOMECFLAGS@
-CC_LDFLAGS = @CC_LDFLAGS@ 
+CC_LDFLAGS = @CC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
 CC_PICFLAGS = @CC_PICFLAGS@
 
 ##################
@@ -44,7 +44,7 @@
 ##################
 FC = @FC@
 FC_OPTIONS = @FC_OPTIONS@
-FC_LDFLAGS = @FC_LDFLAGS@
+FC_LDFLAGS = @FC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
 FC_PICFLAGS = @FC_PICFLAGS@
 
 ########
@@ -52,7 +52,7 @@
 # typically, for linking: $(LD) -o $(PROGRAM) $(OBJS) $(LD_LDFLAGS)
 ########
 LD = @LD@
-LD_LDFLAGS = @LD_LDFLAGS@
+LD_LDFLAGS = @LD_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
 
 ##########
 # X Window: use $(XFLAGS) for compilation and $(XLIBS) for linking
diff -Naur scilab-4.1.2/configure.in scilab-4.1.2.new/configure.in
--- scilab-4.1.2/configure.in	2007-09-10 03:46:20.000000000 -0500
+++ scilab-4.1.2/configure.in	2007-09-10 03:46:20.000000000 -0500
@@ -537,10 +537,10 @@
 			CC_OPTIONS='-g -Wall -Dlinux  -DNARROWPROTO  -mp '
 			FC_OPTIONS="-g -cm  -w90 -w95 -mp "
 		fi
-		CC_LDFLAGS="$LIEEELIB  -Wl,-relax"
-		FC_LDFLAGS="$LIEEELIB -ldl  -lPEPCF90 -Wl,-relax "
+		CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB  -Wl,-relax"
+		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl  -lPEPCF90 -Wl,-relax "
 		LD=xild
-		LD_LDFLAGS="$LIEEELIB -lPEPCF90 -Wl,-relax "
+		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -lPEPCF90 -Wl,-relax "
 	else
 		GCC=yes
 		CC=gcc
@@ -551,7 +551,7 @@
 		FC_PICFLAGS='-fPIC'
 		
 		CC_OPTIONS="-O2 -DNDEBUG -Dlinux  -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "
-		CC_LDFLAGS=$LIEEELIB
+		CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
 
 		if test "$enable_debug" = yes; then
 			CC_OPTIONS="-g -Wall -Dlinux -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "
@@ -652,9 +652,9 @@
 				fi
 			fi
 		fi
-		FC_LDFLAGS="$LIEEELIB -ldl -rdynamic -Wl,-relax "
+		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic -Wl,-relax "
 		LD=ld
-		LD_LDFLAGS="$LIEEELIB -Wl,-relax "
+		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -Wl,-relax "
 	fi
 	MAKEFILE_TARGET=Makefile.linux64
 	;;
@@ -851,10 +851,10 @@
 			CC_OPTIONS='-g -Wall -Dlinux  -DNARROWPROTO  -mp -pc64 -ffnalias -falias'
 			FC_OPTIONS="-g -cm  -w90 -w95 -mp -pc64 -ffnalias -falias"
 		fi
-		CC_LDFLAGS=$LIEEELIB
-		FC_LDFLAGS="$LIEEELIB -ldl"
+		CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
+		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl"
 		LD=xild
-		LD_LDFLAGS="$LIEEELIB"
+		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
 	else
 		GCC=yes
 		GCCFIX=fix.o
@@ -864,7 +864,7 @@
 		else
 			CC_OPTIONS='-O -DNDEBUG -Dlinux  -DNARROWPROTO'
 		fi
-		CC_LDFLAGS=$LIEEELIB
+		CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
 		CC_PICFLAGS=-fPIC
 		# find Fortran compiler
 		# g77 already asked and found: good
@@ -963,9 +963,9 @@
 				fi
 			fi
 		fi
-		FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
+		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic"
 		LD=ld
-		LD_LDFLAGS=$LIEEELIB
+		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
 	fi
 	MAKEFILE_TARGET=Makefile.linux
 	;;
@@ -1483,7 +1483,7 @@
 
 # flag for possible compilations in configure
 CFLAGS=$CC_OPTIONS
-LDFLAGS=$CC_LDFLAGS
+LDFLAGS="$CC_LDFLAGS -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5"
 
 ############################
 ## test for various programs