summaryrefslogtreecommitdiff
path: root/math/scilab/files/patch-configure
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2020-05-31 13:11:27 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2020-05-31 13:11:27 +0000
commit436139c7b36f4bd469949c7fbca5de7bdaec42cb (patch)
treed037dd9c9e92b5fc3afcf2325ed42be420317c81 /math/scilab/files/patch-configure
parentNew port graphics/tslib, touchscreen support (diff)
math/scilab:
- Update to 6.1.0. Requires decent c++ compiler and iconv from ports. - Clean up patch target: remove no longer needed patches and those ones which don't affect build - at least for me. - Remove MAKE_JOBS_UNSAFE. It was added in svn r417126 arguing that many ocaml-dependent ports are not jobs safe, but there were no logs to analyse. The plist change in that commit is unrelated to jobs safety.
Notes
Notes: svn path=/head/; revision=537160
Diffstat (limited to 'math/scilab/files/patch-configure')
-rw-r--r--math/scilab/files/patch-configure40
1 files changed, 29 insertions, 11 deletions
diff --git a/math/scilab/files/patch-configure b/math/scilab/files/patch-configure
index 517bb451f5e0..e62769947c7e 100644
--- a/math/scilab/files/patch-configure
+++ b/math/scilab/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig 2015-10-02 17:09:45.251035000 +0000
-+++ configure 2015-10-02 17:07:21.796652000 +0000
-@@ -11863,7 +11863,7 @@
- fi
- fi
- 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 -ljvm"
-+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm -pthread"
- D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
- if test -d $D; then
- ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+--- configure.orig 2020-02-25 09:59:42 UTC
++++ configure
+@@ -9995,7 +9995,7 @@ if test -z "$CXX"; then
+ fi
+
+ case "$CXX" in
+- g++-* | g++ | ccache*g++ | ccache*g++-* )
++ g++-* | g++ | ccache*g++ | ccache*g++-* | c++ | clang++* )
+ ## With GNU C++ Compiler
+
+ # enable the code coverage
+@@ -10022,7 +10022,7 @@ esac
+ #### 64 bits detection
+ IS_64_BITS_CPU=false
+ case "$host" in
+- x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd*)
++ x86_64-*-linux-gnu | x86_64-linux-gnu | ia64-*-linux-gnu | alpha-*-linux-gnu | alpha-*-netbsd* | x86_64-*-netbsd* | sparc64-*-netbsd* | amd64-*-freebsd* )
+ IS_64_BITS_CPU=true
+ ;;
+ esac
+@@ -10030,7 +10030,7 @@ esac
+ ##########"
+
+ case "$CC" in
+- gcc-* | gcc | ccache*gcc | ccache*gcc-* )
++ gcc-* | gcc | ccache*gcc | ccache*gcc-* | cc | clang* )
+ ## With GNU Compiler
+
+ # enable the code coverage