diff options
| author | makc <makc@FreeBSD.org> | 2014-07-10 18:08:10 +0800 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2014-07-10 18:08:10 +0800 |
| commit | 61fa5a90740cda7c08ab30ed9020b22e9941310c (patch) | |
| tree | ce9901339702d925e5f4540ff5fa874c0a955dae /math/scilab | |
| parent | ad087a979fc0c9dd95e2c19f008d7669f3b5a293 (diff) | |
| download | freebsd-ports-gnome-61fa5a90740cda7c08ab30ed9020b22e9941310c.tar.gz freebsd-ports-gnome-61fa5a90740cda7c08ab30ed9020b22e9941310c.tar.zst freebsd-ports-gnome-61fa5a90740cda7c08ab30ed9020b22e9941310c.zip | |
math/scilab:
- Fix build after recent switch to OpenJDK 1.7 [1]
- Remove HOME from MAKE_ENV, it's now set in bsd.port.mk
PR: 191523
Submitted by: kenji@k2r.org
Diffstat (limited to 'math/scilab')
| -rw-r--r-- | math/scilab/Makefile | 4 | ||||
| -rw-r--r-- | math/scilab/files/patch-configure | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/math/scilab/Makefile b/math/scilab/Makefile index a6d98f6becf6..7026abc9c596 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -31,8 +31,8 @@ CONFIGURE_ARGS= --with-gfortran \ --without-hdf5 CONFIGURE_ENV= ac_cv_search_pthread_join="${PTHREAD_LIBS}" \ BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}" -# prevert from creating $HOME/.Scilab during build -MAKE_ENV= HOME=/dev/null +MAKE_ENV= LANG=en_US.UTF-8 \ + LC_ALL=en_US.UTF-8 OPTIONS_DEFINE= ATLAS FFTW GUI HELP NLS MATIO OCAML PVM TK UMFPACK OPTIONS_DEFAULT= FFTW GUI HELP diff --git a/math/scilab/files/patch-configure b/math/scilab/files/patch-configure index d0079959df09..d057db61a5e7 100644 --- a/math/scilab/files/patch-configure +++ b/math/scilab/files/patch-configure @@ -1,5 +1,23 @@ --- ./configure.orig 2011-07-20 08:15:42.000000000 +0000 +++ ./configure 2013-10-23 11:59:48.722499060 +0000 +@@ -10719,7 +10719,7 @@ + ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" + D=$ac_java_jvm_dir/jre/lib/$machine/native_threads + ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" +- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi" ++ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" + fi + fi + +@@ -10850,7 +10850,7 @@ + ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" + D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads + ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D" +- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi" ++ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm" + fi + fi + @@ -12226,14 +12226,15 @@ public class conftest { |