[112810] trunk/dports/math/octave-devel

[michaelld at macports.org]

Revision: 112810
          https://trac.macports.org/changeset/112810
Author:   michaelld at macports.org
Date:     2013-11-01 13:41:01 -0700 (Fri, 01 Nov 2013)
Log Message:
-----------
octave-devel:
* add patch to configure to allow clang to work with the test for std::unordered_map;
* fix Portfile such that 10.9 gets the src/display.cc patch too;
* hopefully addresses ticket #40806.

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-devel/files/patch-configure.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2013-11-01 20:28:12 UTC (rev 112809)
+++ trunk/dports/math/octave-devel/Portfile	2013-11-01 20:41:01 UTC (rev 112810)
@@ -107,22 +107,22 @@
 
 compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
 
-platform darwin 11 {
-    # 10.7 requires an extra patch; this patch will break the build on
-    # 10.6 and prior, so apply it only under 10.7.
+platform darwin {
+    if {${os.major} > 11} {
 
-    patchfiles-append patch-src-display.cc.diff
-}
+        # 10.7+ requires an extra patch; this patch will break the
+        # build on 10.6 and prior, so apply it only under 10.7.
 
-platform darwin 12 {
-    # In 10.8 patch is required as above, also
-    # the LANG environment variable needs to
-    # be set to "C" otherwise /usr/bin/sed
-    # fails with an error, if you installed gsed
-    # with default name this should have no effect.
+        patchfiles-append patch-src-display.cc.diff
+    }
+    if {${os.major} > 12} {
 
-    patchfiles-append patch-src-display.cc.diff
-    build.args-append LANG="C"
+        # In 10.8+, the LANG environment variable needs to be set to
+        # "C" otherwise /usr/bin/sed fails with an error, if you
+        # installed gsed with default name this should have no effect.
+
+        build.args-append LANG="C"
+    }
 }
 
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}

Added: trunk/dports/math/octave-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/math/octave-devel/files/patch-configure.diff	2013-11-01 20:41:01 UTC (rev 112810)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-11-01 12:13:00.000000000 -0400
++++ configure	2013-11-01 12:44:53.000000000 -0400
+@@ -58248,7 +58248,7 @@
+ main ()
+ {
+ 
+-      std::unordered_map m;
++      std::unordered_map<int,int> m;
+ 
+   ;
+   return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131101/24e72a13/attachment.html>