diff options
| author | pav <pav@FreeBSD.org> | 2003-12-07 02:07:58 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2003-12-07 02:07:58 +0000 |
| commit | 89cc0346755b5a1caf7d7d338de6607814e1b83f (patch) | |
| tree | aa119fb7d420f6fda2bc1adc7027189b4202ffd8 /math/octave-devel | |
| parent | 4b40629b7cbe3c5d535eb0846ea3b5937adffc1c (diff) | |
| download | FreeBSD-ports-89cc0346755b5a1caf7d7d338de6607814e1b83f.zip FreeBSD-ports-89cc0346755b5a1caf7d7d338de6607814e1b83f.tar.gz | |
- 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>
Diffstat (limited to 'math/octave-devel')
| -rw-r--r-- | math/octave-devel/Makefile | 12 | ||||
| -rw-r--r-- | math/octave-devel/files/patch-mkoctfile.in | 11 | ||||
| -rw-r--r-- | math/octave-devel/pkg-plist | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile index ec35ed0..29c5cd5 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -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 diff --git a/math/octave-devel/files/patch-mkoctfile.in b/math/octave-devel/files/patch-mkoctfile.in new file mode 100644 index 0000000..0eb4c4c --- /dev/null +++ b/math/octave-devel/files/patch-mkoctfile.in @@ -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) diff --git a/math/octave-devel/pkg-plist b/math/octave-devel/pkg-plist index 20a7c1c..3ff9792 100644 --- a/math/octave-devel/pkg-plist +++ b/math/octave-devel/pkg-plist @@ -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 |
