kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/math/scilab/patches/patch-aa

242 lines
6.6 KiB
Text
Raw Blame History

$NetBSD: patch-aa,v 1.13 2007/04/10 15:53:16 joerg Exp $
--- configure.in.orig 2006-11-03 15:06:57.000000000 +0000
+++ configure.in
@@ -163,7 +163,7 @@ fi
# use for making scripts in script directory
# different for MIPS Ultrix
-SCILAB_GS=sh
+SCILAB_GS=${SCILAB_GS:-sh}
# scilab script file in script directory: default is "scilab.g" for UNIX
# for gcwin32 use "scilab-gcwin32.g"
SCILABSCRIPT=scilab.g
@@ -413,50 +413,31 @@ case "$host" in
;;
# SUN SOLARIS
*-*-solaris*)
- # standard compilers
- CC=cc
- CC_OPTIONS='-O -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
- CC_LDFLAGS=
- if test "$WITH_G77" != yes; then
- #AC_CHECK_PROG(F77,f77,yes,no)
- AC_CHECK_PROGS(F77,f77 f90 f2c-f77,no)
- if test "$F77" = no; then
- AC_MSG_ERROR([Unable to configure: Fortran f77 compiler not found])
- fi
- FC="$F77"
- fi
- #FC="$F77"
- FC_OPTIONS=-O
- FC_OPTIONS_O0=
- FC_LDFLAGS=
- LD=ld
- LD_LDFLAGS=
+ SCILAB_GS=ksh
+
+ #
+ # C Compiler
+ #
+
+ AC_PROG_CC
+ CC_OPTIONS="${CFLAGS} -DNDEBUG -DSVR4 -DSYSV -Dsolaris"
+ CC_LDFLAGS="${LDFLAGS}"
+
+ #
+ # Fortran Compiler
+ #
+
+ AC_PROG_F77
+ AC_F77_LIBRARY_LDFLAGS
+ FC="$F77"
+ FC_OPTIONS="${FFLAGS}"
+
if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
- FC_OPTIONS=-g
+ CC_OPTIONS="-g ${CC_OPTIONS}"
+ FC_OPTIONS="-g ${CC_OPTIONS}"
fi
- # GNU compilers
- if test "$WITH_GCC" = yes; then
- CC=gcc
- CC_OPTIONS='-O2 -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
- if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
- fi
- fi
- if test "$WITH_G77" = yes; then
- FC=g77
- FC_OPTIONS=-O2
- FC_OPTIONS_O0=
- FC_LDFLAGS='-t'
-# for solaris 2.7 with gcc/g77 2.95.2, binutils 2.9
-# the correct value should be
-# FC_LDFLAGS='-t -Wl,-export-dynamic'
-# but we need to check this case
- if test "$enable_debug" = yes; then
- FC_OPTIONS=-g
- fi
- fi
- AC_F77_LIBRARY_LDFLAGS
+ FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`
+
MAKEFILE_TARGET=Makefile.solaris
;;
# Linux, old binary format a.out (NO LONGER SUPPORTED)
@@ -854,11 +835,11 @@ i*86-*-linux-gnu | *-linux-gnu )
GCCFIX=fix.o
CC=gcc
if test "$enable_debug" = yes; then
- CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO'
+ CC_OPTIONS="${CFLAGS} -g -Wall -Dlinux -DNARROWPROTO"
else
- CC_OPTIONS='-O -DNDEBUG -Dlinux -DNARROWPROTO'
+ CC_OPTIONS="${CFLAGS} -DNDEBUG -Dlinux -DNARROWPROTO"
fi
- CC_LDFLAGS=$LIEEELIB
+ CC_LDFLAGS="${LDFLAGS} $LIEEELIB"
CC_PICFLAGS=-fPIC
# find Fortran compiler
# g77 already asked and found: good
@@ -869,7 +850,7 @@ i*86-*-linux-gnu | *-linux-gnu )
FC_OPTIONS="-g"
FC_OPTIONS_O0=""
else
- FC_OPTIONS="-O"
+ FC_OPTIONS=""
FC_OPTIONS_O0=""
fi
elif test "$WITH_GFORTRAN" = yes;then
@@ -908,7 +889,7 @@ i*86-*-linux-gnu | *-linux-gnu )
FC_OPTIONS="-g"
FC_OPTIONS_O0=""
else
- FC_OPTIONS="-O"
+ FC_OPTIONS=""
FC_OPTIONS_O0=""
fi
else
@@ -957,7 +938,9 @@ i*86-*-linux-gnu | *-linux-gnu )
fi
fi
fi
- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
+ FC_OPTIONS="${FFLAGS} ${FC_OPTIONS}"
+ FC_OPTIONS_O0="`echo ${FC_OPTIONS} | sed 's/-O[[0-9]]*//'`"
+ FC_LDFLAGS="${LDFLAGS} $LIEEELIB -ldl -rdynamic"
LD=ld
LD_LDFLAGS=$LIEEELIB
fi
@@ -1283,17 +1266,17 @@ i*86-*-linux-gnu | *-linux-gnu )
MAKEFILE_TARGET=Makefile.mingwin32
;;
# FreeBSD systems (not supported by INRIA)
- *-*-freebsd*)
+ *-*-freebsd* | *-*-dragonfly*)
GCC=yes
CC=$CC
CC_OPTIONS="${CFLAGS} -Dfreebsd"
- CC_LDFLAGS=-lm
+ CC_LDFLAGS="-lm ${LDFLAGS} -Wl,-R${X11BASE}/lib"
CC_PICFLAGS='-fPIC'
# script shell f77 have bugs, get ours
FC=$F77
FC_OPTIONS="${CFLAGS} -Dfreebsd"
FC_OPTIONS_O0='-Dfreebsd'
- FC_LDFLAGS='-lm -Wl,--export-dynamic'
+ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib -lm -Wl,--export-dynamic"
FC_PICFLAGS='-fPIC'
LD=ld
LD_LDFLAGS=-lm
@@ -1337,8 +1320,8 @@ i*86-*-linux-gnu | *-linux-gnu )
AC_F77_LIBRARY_LDFLAGS
FC="$F77"
FC_OPTIONS="${FFLAGS}"
- FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[0-9]*//g'`
- FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib"
+ FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`
+ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib"
FC_PICFLAGS='-fPIC'
# check for --export-dynamic
ac_save_LDFLAGS="$LDFLAGS"
@@ -1418,30 +1401,7 @@ esac
# in "routines/sparse": intreadmps.f
# in "routines/calelm": unsfdcopy.f icopy.f
-FC_OPTIONS1=$FC_OPTIONS
-if test "$WITH_G77" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
-
-if test "$with_f2c" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
-
-if test "$WITH_GFORTRAN" = yes; then
- if test "$enable_debug" = yes; then
- FC_OPTIONS1=$FC_OPTIONS
- else
- FC_OPTIONS1=$FC_OPTIONS_O0
- fi
-fi
+FC_OPTIONS1="`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`"
# due overlapping arguments a few files must not be compiled
# with optimizer on some computers (Sun sparc solaris with at least
@@ -1452,11 +1412,7 @@ FC_OPTIONS2=$FC_OPTIONS
case "$host" in
# Sun solaris
*solaris*)
- if test "$enable_debug" = yes; then
- FC_OPTIONS2=$FC_OPTIONS
- else
- FC_OPTIONS2=$FC_OPTIONS_O0
- fi
+ FC_OPTIONS2="`echo $FC_OPTIONS | sed 's/-O[[0-9]]*//g'`"
;;
esac
@@ -1580,7 +1536,8 @@ if test "$PERIFILE" = periX11.o; then
LDFLAGS="$ac_save_LDFLAGS"
save_cflags=$CFLAGS
CFLAGS="$X_CFLAGS $CC_OPTIONS"
- AC_TRY_COMPILE([#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>],,,
+ AC_TRY_COMPILE([#include <X11/IntrinsicP.h>
+ #include <X11/Xaw3d/ViewportP.h>],,,
AC_MSG_ERROR([Include file "ViewportP.h" for Xaw3d not found.
Get and put it in <X11/Xaw3d/> .]))
CFLAGS=$save_cflags
@@ -1901,15 +1858,15 @@ if test "$with_tk" != no; then
;;
esac
- GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
+ GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
- case "$host" in
- *-*-darwin*)
- GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
- ;;
- *-*-cygwin* | *-*-mingw32*)
- GETLIBTK=tk$TK_MAJOR_VERSION$TK_MINOR_VERSION.dll
- esac
+ #case "$host" in
+ # *-*-darwin*)
+ # GETLIBTK=/sw/lib/libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.dylib
+ # ;;
+ # *-*-cygwin* | *-*-mingw32*)
+ # GETLIBTK=tk$TK_MAJOR_VERSION$TK_MINOR_VERSION.dll
+ #esac
fi
Reference in a new issue View git blame Copy permalink