diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2014-01-22 22:18:37 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2014-01-22 22:18:37 +0000 |
| commit | 2df7f4ddd2abcc0aec78f03cab9323b3e2ff976d (patch) | |
| tree | 5cf60bba340cfb126677a623f8e95dc772be3d41 /math/octave/files/patch-configure | |
| parent | Stage support (diff) | |
Update to 3.8.0
PR: 185991
Submitted by: Max Sterling <maxclsb@gmail.com>
Diffstat (limited to 'math/octave/files/patch-configure')
| -rw-r--r-- | math/octave/files/patch-configure | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/math/octave/files/patch-configure b/math/octave/files/patch-configure index 14bcdaaef08f..933bf2e05c39 100644 --- a/math/octave/files/patch-configure +++ b/math/octave/files/patch-configure @@ -1,11 +1,16 @@ ---- configure.orig 2013-02-21 21:21:49.000000000 +0100 -+++ configure 2013-11-22 20:34:49.000000000 +0100 -@@ -58248,7 +58248,7 @@ - main () - { - -- std::unordered_map m; -+ std::unordered_map<int, int> m; - - ; - return 0; +--- configure.orig 2014-01-21 15:52:33.000000000 -0700 ++++ configure 2014-01-21 15:54:59.000000000 -0700 +@@ -68380,6 +68380,13 @@ + fi + JAVA_LIBS="-framework JavaVM" + ;; ++ freebsd*) ++ if test -n "$JAVA_CPPFLAGS"; then ++ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/freebsd" ++ else ++ JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" ++ fi ++ ;; + *) + if test -n "$JAVA_CPPFLAGS"; then + JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS}/include -I${JAVA_CPPFLAGS}/include/linux" |