Changeset 112810


Ignore:
Timestamp:
Nov 1, 2013, 8:41:01 PM (6 years ago)
Author:
michaelld@…
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.
Location:
trunk/dports/math/octave-devel
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-devel/Portfile

    r112628 r112810  
    108108compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
    109109
    110 platform darwin 11 {
    111     # 10.7 requires an extra patch; this patch will break the build on
    112     # 10.6 and prior, so apply it only under 10.7.
    113 
    114     patchfiles-append patch-src-display.cc.diff
    115 }
    116 
    117 platform darwin 12 {
    118     # In 10.8 patch is required as above, also
    119     # the LANG environment variable needs to
    120     # be set to "C" otherwise /usr/bin/sed
    121     # fails with an error, if you installed gsed
    122     # with default name this should have no effect.
    123 
    124     patchfiles-append patch-src-display.cc.diff
    125     build.args-append LANG="C"
     110platform darwin {
     111    if {${os.major} > 11} {
     112
     113        # 10.7+ requires an extra patch; this patch will break the
     114        # build on 10.6 and prior, so apply it only under 10.7.
     115
     116        patchfiles-append patch-src-display.cc.diff
     117    }
     118    if {${os.major} > 12} {
     119
     120        # In 10.8+, the LANG environment variable needs to be set to
     121        # "C" otherwise /usr/bin/sed fails with an error, if you
     122        # installed gsed with default name this should have no effect.
     123
     124        build.args-append LANG="C"
     125    }
    126126}
    127127
Note: See TracChangeset for help on using the changeset viewer.