pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/math/scilab Honour LDFLAGS, fix errno usage.
details: https://anonhg.NetBSD.org/pkgsrc/rev/aab66dcd7549
branches: trunk
changeset: 512612:aab66dcd7549
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri May 12 12:39:32 2006 +0000
description:
Honour LDFLAGS, fix errno usage.
diffstat:
math/scilab/Makefile | 4 +-
math/scilab/distinfo | 9 +-
math/scilab/patches/patch-ab | 416 ++++++++++++++++++++++++++++++++++++++++++-
math/scilab/patches/patch-as | 19 +
math/scilab/patches/patch-at | 14 +
math/scilab/patches/patch-au | 12 +
math/scilab/patches/patch-av | 14 +
math/scilab/patches/patch-aw | 13 +
8 files changed, 492 insertions(+), 9 deletions(-)
diffs (truncated from 602 to 300 lines):
diff -r 9be156531ec8 -r aab66dcd7549 math/scilab/Makefile
--- a/math/scilab/Makefile Fri May 12 12:26:58 2006 +0000
+++ b/math/scilab/Makefile Fri May 12 12:39:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2006/05/12 12:39:32 joerg Exp $
#
DISTNAME= ${SCIBASE}-src
@@ -36,6 +36,8 @@
CONFIGURE_ARGS+= --with-tk-include=${TK_PREFIX}/include
CONFIGURE_ENV+= TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
CONFIGURE_ENV+= TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
+CONFIGURE_ENV+= CC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.tk:Q}/lib
+CONFIGURE_ENV+= FC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.tk:Q}/lib
# override HOME to avoid picking up a bad ${HOME}/.scilab during the build
MAKE_ENV+= HOME=${WRKSRC:Q}
diff -r 9be156531ec8 -r aab66dcd7549 math/scilab/distinfo
--- a/math/scilab/distinfo Fri May 12 12:26:58 2006 +0000
+++ b/math/scilab/distinfo Fri May 12 12:39:32 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2005/09/22 00:05:40 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2006/05/12 12:39:32 joerg Exp $
SHA1 (scilab-3.1.1-src.tar.gz) = 63cae13441befb795d32cec5f825042b6b4e74b3
RMD160 (scilab-3.1.1-src.tar.gz) = 363486c6c9d1e64a28edcd002651e3c9d3b1eb73
Size (scilab-3.1.1-src.tar.gz) = 14261772 bytes
SHA1 (patch-aa) = 6d9749330ba4471de03a2873daee5b9fdc0aac06
-SHA1 (patch-ab) = 5119dcbfdf987e7303446b06c9126137e740e1b8
+SHA1 (patch-ab) = 3a76282796d2b091e355914b2a18a8705f3c2060
SHA1 (patch-ac) = 0c48500eb261d643bdd5c1d34d23968b312eae57
SHA1 (patch-ad) = 186b5b1b71ccd983f49ae4c1bfb45152d4ebd662
SHA1 (patch-ae) = 050ea8847196c2808a74c252db7c98d77677cd25
@@ -21,3 +21,8 @@
SHA1 (patch-ap) = 0f87996f0940459b57248068021c6bd565be258e
SHA1 (patch-aq) = 158c9f7466f488f2dad9b1b73939bd0ceaf39b98
SHA1 (patch-ar) = fba20ba23ec78262c6eba1248b662d08e727cada
+SHA1 (patch-as) = a361ad1d13cd87f114f340ff34052dab7695da88
+SHA1 (patch-at) = 6e08f40a709e6b64f269dd39e5aeeb187de04edb
+SHA1 (patch-au) = 68c0988dd41420257e9ca8a6ac050ee851b59787
+SHA1 (patch-av) = 513338ab284477cc4f67f121e92eb7cc0fa89ac2
+SHA1 (patch-aw) = 0bdc9337269a6fc0e242fc0583750484aa4a87fb
diff -r 9be156531ec8 -r aab66dcd7549 math/scilab/patches/patch-ab
--- a/math/scilab/patches/patch-ab Fri May 12 12:26:58 2006 +0000
+++ b/math/scilab/patches/patch-ab Fri May 12 12:39:32 2006 +0000
@@ -1,7 +1,106 @@
-$NetBSD: patch-ab,v 1.10 2005/09/22 00:05:40 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.11 2006/05/12 12:39:32 joerg Exp $
--- configure.orig 2005-05-25 15:00:45.000000000 +0000
+++ configure
+@@ -18362,7 +18362,7 @@ case "$host" in
+ else
+ CC=cc
+ CC_OPTIONS='-std -O -DNDEBUG -ieee_with_inexact'
+- CC_LDFLAGS='-ieee_with_inexact'
++ CC_LDFLAGS="${CC_LDFLAGS} -ieee_with_inexact"
+ fi
+ #fortran compiler
+ if test "$WITH_G77" = yes; then
+@@ -18422,7 +18422,7 @@ echo "$as_me: error: Unable to configure
+ FC="$F77"
+ FC_OPTIONS='-O -fpe3'
+ FC_OPTIONS_O0='-fpe3'
+- FC_LDFLAGS=
++ FC_LDFLAGS="${FC_LDFLAGS}"
+ FC_USE_CDEC=' '
+ if test "$enable_debug" = yes; then
+ CC_OPTIONS='-std -g -ieee_with_inexact'
+@@ -18439,7 +18439,7 @@ echo "$as_me: error: Unable to configure
+ # standard compilers
+ CC=cc
+ CC_OPTIONS='-O -DNDEBUG -ieee_with_inexact'
+- CC_LDFLAGS='-ieee_with_inexact'
++ CC_LDFLAGS="${CC_LDFLAGS} -ieee_with_inexact"
+ if test "$WITH_G77" != yes; then
+ #AC_CHECK_PROG(F77,f77,yes,no)
+ for ac_prog in f77 f90 f2c-f77
+@@ -18493,7 +18493,7 @@ echo "$as_me: error: Unable to configure
+ #FC="$F77"
+ FC_OPTIONS='-O -fpe3 -switch nosqrt_recip'
+ FC_OPTIONS_O0='-fpe3 -switch nosqrt_recip'
+- FC_LDFLAGS=
++ FC_LDFLAGS="${FC_LDFLAGS}"
+ FC_USE_CDEC=' '
+ LD=ld
+ LD_LDFLAGS=
+@@ -18524,7 +18524,7 @@ echo "$as_me: error: Unable to configure
+ # standard compilers
+ CC=cc
+ CC_OPTIONS='-Daix -DSYSV'
+- CC_LDFLAGS=
++ CC_LDFLAGS="${CC_LDFLAGS}"
+ if test "$WITH_G77" != yes; then
+ #AC_CHECK_PROG(F77,f77,yes,no)
+ for ac_prog in f77 f90 f2c-f77
+@@ -18578,7 +18578,7 @@ echo "$as_me: error: Unable to configure
+ #FC="$F77"
+ FC_OPTIONS='-qcharlen=4096'
+ FC_OPTIONS_O0='-qcharlen=4096'
+- FC_LDFLAGS=
++ FC_LDFLAGS="${FC_LDFLAGS}"
+ LD=ld
+ LD_LDFLAGS=
+ if test "$enable_debug" = yes; then
+@@ -18661,7 +18661,7 @@ fi
+ GCC=yes
+ CC=gcc
+ CC_OPTIONS='-O -DNDEBUG -Dlinux -fwritable-strings'
+- CC_LDFLAGS=$LIEEELIB
++ CC_LDFLAGS="${CC_LDFLAGS} $LIEEELIB"
+ # find Fortran compiler
+ # g77 already asked and found: good
+ if test "$WITH_G77" = yes; then
+@@ -18801,7 +18801,7 @@ echo "$as_me: error: Unable to configure
+ fi
+ FC_OPTIONS=-O
+ FC_OPTIONS_O0=
+- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -rdynamic"
+ LD=ld
+ LD_LDFLAGS=$LIEEELIB
+ if test "$enable_debug" = yes; then
+@@ -18815,7 +18815,7 @@ echo "$as_me: error: Unable to configure
+ # standard compilers
+ CC=cc
+ CC_OPTIONS=-O -DNDEBUG
+- CC_LDFLAGS=
++ CC_LDFLAGS="${CC_LDFLAGS}"
+ CC_PICFLAGS=-PIC
+ if test "$WITH_G77" != yes; then
+ #AC_CHECK_PROG(F77,f77,yes,no)
+@@ -18870,7 +18870,7 @@ echo "$as_me: error: Unable to configure
+ #FC="$F77"
+ FC_OPTIONS=-O
+ FC_OPTIONS_O0=
+- FC_LDFLAGS=
++ FC_LDFLAGS="${FC_LDFLAGS}"
+ FC_PICFLAGS=-PIC
+ LD=ld
+ LD_LDFLAGS=
+@@ -18895,7 +18895,7 @@ echo "$as_me: error: Unable to configure
+ if test "$enable_debug" = yes; then
+ FC_OPTIONS=-g
+ fi
+- FC_LDFLAGS='-Xlinker'
++ FC_LDFLAGS="${FC_LDFLAGS} -Xlinker"
+ fi
+ MAKEFILE_TARGET=Makefile.sunos
+ ;;
@@ -18903,8 +18903,8 @@ echo "$as_me: error: Unable to configure
*-*-solaris*)
# standard compilers
@@ -9,7 +108,7 @@
- CC_OPTIONS='-O -DNDEBUG -DSVR4 -DSYSV -Dsolaris'
- CC_LDFLAGS=
+ CC_OPTIONS="${CFLAGS} -DNDEBUG -DSVR4 -DSYSV -Dsolaris"
-+ CC_LDFLAGS="${LDFLAGS}"
++ CC_LDFLAGS="${CC_LDFLAGS}"
if test "$WITH_G77" != yes; then
#AC_CHECK_PROG(F77,f77,yes,no)
for ac_prog in f77 f90 f2c-f77
@@ -18,10 +117,10 @@
FC_OPTIONS=-O
FC_OPTIONS_O0=
- FC_LDFLAGS=
-+ FC_LDFLAGS="${LDFLAGS}"
++ FC_LDFLAGS="${FC_LDFLAGS}"
LD=ld
- LD_LDFLAGS=
-+ LD_LDFLAGS="${LDFLAGS}"
++ LD_LDFLAGS="${FC_LDFLAGS}"
if test "$enable_debug" = yes; then
CC_OPTIONS='-g -DSVR4 -DSYSV -Dsolaris'
FC_OPTIONS=-g
@@ -30,19 +129,313 @@
FC_OPTIONS=-O2
FC_OPTIONS_O0=
- FC_LDFLAGS='-t'
-+ FC_LDFLAGS="${LDFLAGS} -t"
++ FC_LDFLAGS="${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'
+@@ -19341,7 +19341,7 @@ fi
+ GCC=yes
+ CC=gcc
+ CC_OPTIONS='-O -DNDEBUG -Dlinux -fwritable-strings'
+- CC_LDFLAGS=$LIEEELIB
++ CC_LDFLAGS="${CC_LDFLAGS} $LIEEELIB"
+ # find Fortran compiler
+ # g77 already asked and found: good
+ if test "$WITH_G77" = yes; then
+@@ -19481,7 +19481,7 @@ echo "$as_me: error: Unable to configure
+ fi
+ FC_OPTIONS=-O
+ FC_OPTIONS_O0=
+- FC_LDFLAGS=$LIEEELIB
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB"
+ LD=ld
+ LD_LDFLAGS=$LIEEELIB
+ if test "$enable_debug" = yes; then
+@@ -19560,8 +19560,8 @@ fi
+ 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="${CC_LDFLAGS} $LIEEELIB"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl"
+ LD=xild
+ LD_LDFLAGS="$LIEEELIB"
+ else
+@@ -19569,7 +19569,7 @@ fi
+ GCCFIX=fix.o
+ CC=gcc
+ CC_OPTIONS='-O -DNDEBUG -Dlinux -fwritable-strings -DNARROWPROTO'
+- CC_LDFLAGS=$LIEEELIB
++ CC_LDFLAGS="${CC_LDFLAGS} $LIEEELIB"
+ CC_PICFLAGS=-fPIC
+ # find Fortran compiler
+ # g77 already asked and found: good
+@@ -19712,7 +19712,7 @@ echo "$as_me: error: Unable to configure
+ fi
+ FC_OPTIONS=-O
+ FC_OPTIONS_O0=
+- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -rdynamic"
+ if test "$enable_debug" = yes; then
+ CC_OPTIONS='-g -Wall -Dlinux -fwritable-strings -DNARROWPROTO'
+ FC_OPTIONS=-g
+@@ -19791,15 +19791,15 @@ fi
+ CC_OPTIONS='-g -Wall -Dlinux -DNARROWPROTO -mp '
+ FC_OPTIONS="-g -cm -w90 -w95 -mp "
+ fi
+- CC_LDFLAGS="$LIEEELIB -Wl,-relax"
+- FC_LDFLAGS="$LIEEELIB -ldl -Wl,-relax "
++ CC_LDFLAGS="${CCFLAGS} $LIEEELIB -Wl,-relax"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -Wl,-relax "
+ LD=xild
+ LD_LDFLAGS="$LIEEELIB -Wl,-relax "
+ else
+ GCC=yes
+ CC=gcc
+ CC_OPTIONS='-O -DNDEBUG -Dlinux -fwritable-strings -DNARROWPROTO'
+- CC_LDFLAGS=$LIEEELIB
++ CC_LDFLAGS="${CC_LDFLAGS} $LIEEELIB"
+ CC_PICFLAGS=-fPIC
+ # find Fortran compiler
+ # g77 already asked and found: good
+@@ -19942,7 +19942,7 @@ echo "$as_me: error: Unable to configure
+ fi
+ FC_OPTIONS=-O
+ FC_OPTIONS_O0=
+- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic -Wl,-relax"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -rdynamic -Wl,-relax"
+ LD=ld
+ LD_LDFLAGS=$LIEEELIB -Wl,-relax
+ if test "$enable_debug" = yes; then
+@@ -20021,8 +20021,8 @@ fi
+ 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="${CC_LDFLAGS} $LIEEELIB -Wl,-relax"
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -lPEPCF90 -Wl,-relax "
+ LD=xild
+ LD_LDFLAGS="$LIEEELIB -lPEPCF90 -Wl,-relax "
+ else
+@@ -20031,7 +20031,7 @@ fi
+ # CC_PLAT_OPTIONS is optional, and is used to add CPU specific code generation tuning for Athlon64 presumably Opteron could benefit too but these are not optimized for the Opteron
+ CC_PLAT_OPTIONS='-march=athlon64 -mfpmath=sse -msse2 -m3dnow -m64 '
+ CC_OPTIONS="-O2 -DNDEBUG -Dlinux -fwritable-strings -DNARROWPROTO $CC_PLAT_OPTIONS"
+- CC_LDFLAGS=$LIEEELIB
++ CC_LDFLAGS="${CC_LDFLAGS} $LIEEELIB"
+ CC_PICFLAGS=-fPIC
+ # find Fortran compiler
+ # g77 already asked and found: good
+@@ -20174,7 +20174,7 @@ echo "$as_me: error: Unable to configure
+ fi
+ FC_OPTIONS="-O $CC_PLAT_OPTIONS"
+ FC_OPTIONS_O0=
+- FC_LDFLAGS="$LIEEELIB -ldl -rdynamic -Wl,-relax "
++ FC_LDFLAGS="${FC_LDFLAGS} $LIEEELIB -ldl -rdynamic -Wl,-relax "
+ LD=ld
+ LD_LDFLAGS="$LIEEELIB -Wl,-relax "
+ if test "$enable_debug" = yes; then
+@@ -20192,7 +20192,7 @@ echo "$as_me: error: Unable to configure
+ GCC=yes
+ CC=gcc
+ CC_OPTIONS='-O -DNDEBUG -mieee-with-inexact -Dlinux -fwritable-strings'
+- CC_LDFLAGS='-ldl -rdynamic -mieee-with-inexact'
++ CC_LDFLAGS="${CC_LDFLAGS} -ldl -rdynamic -mieee-with-inexact"
+ CC_PICFLAGS=-fPIC
+ # find Fortran compiler
+ # g77 already asked and found: good
+@@ -20333,7 +20333,7 @@ echo "$as_me: error: Unable to configure
+ fi
Home |
Main Index |
Thread Index |
Old Index