Attachment #201743 for bug #263834

View | Details | Raw Unified | Return to bug 263834
Collapse All | Expand All




CC = @CC@
#CC_OPTIONS = @CC_OPTIONS@ @GTKCFLAGS@ @GNOMECFLAGS@
CC_OPTIONS = @CC_OPTIONS@ @GNOMECFLAGS@
CC_LDFLAGS = @CC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
CC_PICFLAGS = @CC_PICFLAGS@

##################

##################
FC = @FC@
FC_OPTIONS = @FC_OPTIONS@
FC_LDFLAGS = @FC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
FC_PICFLAGS = @FC_PICFLAGS@

########

# typically, for linking: $(LD) -o $(PROGRAM) $(OBJS) $(LD_LDFLAGS)
########
LD = @LD@
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




			CC_OPTIONS='-g -Wall -Dlinux  -DNARROWPROTO  -mp '
			FC_OPTIONS="-g -cm  -w90 -w95 -mp "
		fi
		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="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -lPEPCF90 -Wl,-relax "
	else
		GCC=yes
		CC=gcc

		FC_PICFLAGS='-fPIC'
		
		CC_OPTIONS="-O2 -DNDEBUG -Dlinux  -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "
		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 "

				fi
			fi
		fi
		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic -Wl,-relax "
		LD=ld
		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -Wl,-relax "
	fi
	MAKEFILE_TARGET=Makefile.linux64
	;;

			CC_OPTIONS='-g -Wall -Dlinux  -DNARROWPROTO  -mp -pc64 -ffnalias -falias'
			FC_OPTIONS="-g -cm  -w90 -w95 -mp -pc64 -ffnalias -falias"
		fi
		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="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
	else
		GCC=yes
		GCCFIX=fix.o

		else
			CC_OPTIONS='-O -DNDEBUG -Dlinux  -DNARROWPROTO'
		fi
		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

				fi
			fi
		fi
		FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic"
		LD=ld
		LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
	fi
	MAKEFILE_TARGET=Makefile.linux
	;;


# flag for possible compilations in configure
CFLAGS=$CC_OPTIONS
LDFLAGS="$CC_LDFLAGS -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5"

############################
## test for various programs

Return to bug 263834

Lines 34-40 Link Here

(-)scilab-4.1.2/Makefile.incl.in (-3 / +3 lines)
34	CC = @CC@	34	CC = @CC@
35	#CC_OPTIONS = @CC_OPTIONS@ @GTKCFLAGS@ @GNOMECFLAGS@	35	#CC_OPTIONS = @CC_OPTIONS@ @GTKCFLAGS@ @GNOMECFLAGS@
36	CC_OPTIONS = @CC_OPTIONS@ @GNOMECFLAGS@	36	CC_OPTIONS = @CC_OPTIONS@ @GNOMECFLAGS@
37	CC_LDFLAGS = @CC_LDFLAGS@	37	CC_LDFLAGS = @CC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
38	CC_PICFLAGS = @CC_PICFLAGS@	38	CC_PICFLAGS = @CC_PICFLAGS@
39		39
40	##################	40	##################
Lines 44-50 Link Here
44	##################	44	##################
45	FC = @FC@	45	FC = @FC@
46	FC_OPTIONS = @FC_OPTIONS@	46	FC_OPTIONS = @FC_OPTIONS@
47	FC_LDFLAGS = @FC_LDFLAGS@	47	FC_LDFLAGS = @FC_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
48	FC_PICFLAGS = @FC_PICFLAGS@	48	FC_PICFLAGS = @FC_PICFLAGS@
49		49
50	########	50	########
Lines 52-58 Link Here
52	# typically, for linking: $(LD) -o $(PROGRAM) $(OBJS) $(LD_LDFLAGS)	52	# typically, for linking: $(LD) -o $(PROGRAM) $(OBJS) $(LD_LDFLAGS)
53	########	53	########
54	LD = @LD@	54	LD = @LD@
55	LD_LDFLAGS = @LD_LDFLAGS@	55	LD_LDFLAGS = @LD_LDFLAGS@ -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5
56		56
57	##########	57	##########
58	# X Window: use $(XFLAGS) for compilation and $(XLIBS) for linking	58	# X Window: use $(XFLAGS) for compilation and $(XLIBS) for linking

Lines 537-546 Link Here

(-)scilab-4.1.2/configure.in (-13 / +13 lines)
537	CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO -mp '	537	CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO -mp '
538	FC_OPTIONS="-g -cm -w90 -w95 -mp "	538	FC_OPTIONS="-g -cm -w90 -w95 -mp "
539	fi	539	fi
540	CC_LDFLAGS="$LIEEELIB -Wl,-relax"	540	CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -Wl,-relax"
541	FC_LDFLAGS="$LIEEELIB -ldl -lPEPCF90 -Wl,-relax "	541	FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -lPEPCF90 -Wl,-relax "
542	LD=xild	542	LD=xild
543	LD_LDFLAGS="$LIEEELIB -lPEPCF90 -Wl,-relax "	543	LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -lPEPCF90 -Wl,-relax "
544	else	544	else
545	GCC=yes	545	GCC=yes
546	CC=gcc	546	CC=gcc
Lines 551-557 Link Here
551	FC_PICFLAGS='-fPIC'	551	FC_PICFLAGS='-fPIC'
552		552
553	CC_OPTIONS="-O2 -DNDEBUG -Dlinux -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "	553	CC_OPTIONS="-O2 -DNDEBUG -Dlinux -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "
554	CC_LDFLAGS=$LIEEELIB	554	CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
555		555
556	if test "$enable_debug" = yes; then	556	if test "$enable_debug" = yes; then
557	CC_OPTIONS="-g -Wall -Dlinux -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "	557	CC_OPTIONS="-g -Wall -Dlinux -DNARROWPROTO $CC_PLAT_OPTIONS $CC_PICFLAGS "
Lines 652-660 Link Here
652	fi	652	fi
653	fi	653	fi
654	fi	654	fi
655	FC_LDFLAGS="$LIEEELIB -ldl -rdynamic -Wl,-relax "	655	FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic -Wl,-relax "
656	LD=ld	656	LD=ld
657	LD_LDFLAGS="$LIEEELIB -Wl,-relax "	657	LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -Wl,-relax "
658	fi	658	fi
659	MAKEFILE_TARGET=Makefile.linux64	659	MAKEFILE_TARGET=Makefile.linux64
660	;;	660	;;
Lines 851-860 Link Here
851	CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO -mp -pc64 -ffnalias -falias'	851	CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO -mp -pc64 -ffnalias -falias'
852	FC_OPTIONS="-g -cm -w90 -w95 -mp -pc64 -ffnalias -falias"	852	FC_OPTIONS="-g -cm -w90 -w95 -mp -pc64 -ffnalias -falias"
853	fi	853	fi
854	CC_LDFLAGS=$LIEEELIB	854	CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
855	FC_LDFLAGS="$LIEEELIB -ldl"	855	FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl"
856	LD=xild	856	LD=xild
857	LD_LDFLAGS="$LIEEELIB"	857	LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
858	else	858	else
859	GCC=yes	859	GCC=yes
860	GCCFIX=fix.o	860	GCCFIX=fix.o
Lines 864-870 Link Here
864	else	864	else
865	CC_OPTIONS='-O -DNDEBUG -Dlinux -DNARROWPROTO'	865	CC_OPTIONS='-O -DNDEBUG -Dlinux -DNARROWPROTO'
866	fi	866	fi
867	CC_LDFLAGS=$LIEEELIB	867	CC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
868	CC_PICFLAGS=-fPIC	868	CC_PICFLAGS=-fPIC
869	# find Fortran compiler	869	# find Fortran compiler
870	# g77 already asked and found: good	870	# g77 already asked and found: good
Lines 963-971 Link Here
963	fi	963	fi
964	fi	964	fi
965	fi	965	fi
966	FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"	966	FC_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB -ldl -rdynamic"
967	LD=ld	967	LD=ld
968	LD_LDFLAGS=$LIEEELIB	968	LD_LDFLAGS="-L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5 $LIEEELIB"
969	fi	969	fi
970	MAKEFILE_TARGET=Makefile.linux	970	MAKEFILE_TARGET=Makefile.linux
971	;;	971	;;
Lines 1483-1489 Link Here
1483		1483
1484	# flag for possible compilations in configure	1484	# flag for possible compilations in configure
1485	CFLAGS=$CC_OPTIONS	1485	CFLAGS=$CC_OPTIONS
1486	LDFLAGS=$CC_LDFLAGS	1486	LDFLAGS="$CC_LDFLAGS -L/opt/intel/mkl/10.0.5.025/lib/32 -lpthread -liomp5"
1487		1487
1488	############################	1488	############################
1489	## test for various programs	1489	## test for various programs