mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-19 08:13:21 +00:00
- Link with atlas version of lapack
- Make mkoctfile accept -pthread - Don't hardcode path to lib symlink PR: ports/56621, ports/58555 Submitted by: John E. Hein <jhein@timing.com> AMAKAWA Shuhei <sa264@cam.ac.uk>
This commit is contained in:
Pav Lucistnik
parent
afd7f24131
commit
6755309ed2
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=95230
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= octave
|
||||
PORTVERSION= 2.1.50
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
|
||||
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
|
||||
@ -18,8 +18,7 @@ COMMENT= High-level interactive language for numerical computations
|
||||
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
|
||||
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
|
||||
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
|
||||
f77blas.1:${PORTSDIR}/math/atlas \
|
||||
lapack.3:${PORTSDIR}/math/lapack
|
||||
f77blas.1:${PORTSDIR}/math/atlas
|
||||
|
||||
USE_BZIP2= yes
|
||||
|
||||
@ -33,17 +32,18 @@ GNU_HOST= ${ARCH}-portbld-freebsdaout${OSREL}
|
||||
OCTAVE_VERSION= ${PORTVERSION}
|
||||
PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
|
||||
|
||||
BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -latlas"
|
||||
BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -lcblas -latlas"
|
||||
USE_GMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_REINPLACE= yes
|
||||
|
||||
CONFIGURE_ARGS= --host=${GNU_HOST} \
|
||||
--with-fftw --with-blas=${BLAS_LIBS} --with-lpack \
|
||||
--with-fftw --with-blas=${BLAS_LIBS} --with-lapack=-lalapack \
|
||||
--enable-shared
|
||||
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
|
||||
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
|
||||
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
|
||||
FFLAGS="${FFLAGS}"
|
||||
|
||||
.if ${OSVERSION} < 400004
|
||||
CONFIGURE_ARGS+= --with-f2c
|
||||
|
||||
11
math/octave-devel/files/patch-mkoctfile.in
Normal file
11
math/octave-devel/files/patch-mkoctfile.in
Normal file
@ -0,0 +1,11 @@
|
||||
--- mkoctfile.in.orig Thu Jan 2 22:55:47 2003
|
||||
+++ mkoctfile.in Wed Oct 22 10:04:01 2003
|
||||
@@ -182,7 +182,7 @@
|
||||
-D*)
|
||||
defs="$defs $1"
|
||||
;;
|
||||
- -[lL]*)
|
||||
+ -[lL]* | -pthread)
|
||||
ldflags="$ldflags $1"
|
||||
;;
|
||||
-M | --depend)
|
||||
@ -306,7 +306,7 @@ lib/octave-%%OCTAVE_VERSION%%/liboctinterp.a
|
||||
lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so
|
||||
lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so.%%OCTAVE_VERSION%%
|
||||
@unexec /bin/rm -f %D/lib/octave
|
||||
@exec /bin/ln -sf %D/lib/octave-%%OCTAVE_VERSION%% %D/lib/octave
|
||||
@exec /bin/ln -sf octave-%%OCTAVE_VERSION%% %D/lib/octave
|
||||
libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-info
|
||||
libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-octave-help
|
||||
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/airy.oct
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= octave
|
||||
PORTVERSION= 2.1.50
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
|
||||
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
|
||||
@ -18,8 +18,7 @@ COMMENT= High-level interactive language for numerical computations
|
||||
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
|
||||
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
|
||||
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
|
||||
f77blas.1:${PORTSDIR}/math/atlas \
|
||||
lapack.3:${PORTSDIR}/math/lapack
|
||||
f77blas.1:${PORTSDIR}/math/atlas
|
||||
|
||||
USE_BZIP2= yes
|
||||
|
||||
@ -33,17 +32,18 @@ GNU_HOST= ${ARCH}-portbld-freebsdaout${OSREL}
|
||||
OCTAVE_VERSION= ${PORTVERSION}
|
||||
PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
|
||||
|
||||
BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -latlas"
|
||||
BLAS_LIBS= "-L${LOCALBASE}/lib -lf77blas -lcblas -latlas"
|
||||
USE_GMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
USE_REINPLACE= yes
|
||||
|
||||
CONFIGURE_ARGS= --host=${GNU_HOST} \
|
||||
--with-fftw --with-blas=${BLAS_LIBS} --with-lpack \
|
||||
--with-fftw --with-blas=${BLAS_LIBS} --with-lapack=-lalapack \
|
||||
--enable-shared
|
||||
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
|
||||
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
|
||||
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
|
||||
FFLAGS="${FFLAGS}"
|
||||
|
||||
.if ${OSVERSION} < 400004
|
||||
CONFIGURE_ARGS+= --with-f2c
|
||||
|
||||
11
math/octave/files/patch-mkoctfile.in
Normal file
11
math/octave/files/patch-mkoctfile.in
Normal file
@ -0,0 +1,11 @@
|
||||
--- mkoctfile.in.orig Thu Jan 2 22:55:47 2003
|
||||
+++ mkoctfile.in Wed Oct 22 10:04:01 2003
|
||||
@@ -182,7 +182,7 @@
|
||||
-D*)
|
||||
defs="$defs $1"
|
||||
;;
|
||||
- -[lL]*)
|
||||
+ -[lL]* | -pthread)
|
||||
ldflags="$ldflags $1"
|
||||
;;
|
||||
-M | --depend)
|
||||
@ -306,7 +306,7 @@ lib/octave-%%OCTAVE_VERSION%%/liboctinterp.a
|
||||
lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so
|
||||
lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so.%%OCTAVE_VERSION%%
|
||||
@unexec /bin/rm -f %D/lib/octave
|
||||
@exec /bin/ln -sf %D/lib/octave-%%OCTAVE_VERSION%% %D/lib/octave
|
||||
@exec /bin/ln -sf octave-%%OCTAVE_VERSION%% %D/lib/octave
|
||||
libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-info
|
||||
libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-octave-help
|
||||
libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/airy.oct
|
||||
|
||||
Loading…
Reference in New Issue
Block a user