Changeset 153015


Ignore:
Timestamp:
Sep 22, 2016, 11:34:56 AM (3 years ago)
Author:
michaelld@…
Message:

qt4-mac:
+ fix typos;
+ allow building on 10.12;
+ add patch to allow building when using libc++ForOlderSystems on Leopard and Snow Leopard, which addresses ticket #51844.

Location:
trunk/dports/aqua/qt4-mac
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r146318 r153015  
    1212
    1313name                qt4-mac
    14 # qt4-mac-devel is "replaced_by" this port,
    15 # so this port cannot conflict with it.
    16 #conflicts           qt3 qt3-mac qt4-mac-devel
    17 conflicts           qt3 qt3-mac
    1814version             4.8.7
    1915revision            4
     
    272268    patch-src_gui_dialogs_qfiledialog_mac.mm.diff
    273269
    274 # error out if trying to build on a new OSX version (> 10.11).
     270# error out if trying to build on a new OSX version (> 10.12).
    275271
    276272platform darwin {
    277     if {${MINOR} > 11} {
     273    if {${MINOR} > 12} {
    278274        # This project needs to be updated to build with clang++ against libc++
    279275        depends_lib
    280276        depends_run
    281277        pre-fetch {
    282             ui_error "$name does not currently build on OSX later than 10.11 'El Capitan'."
     278            ui_error "$name does not currently build on Mac OS X later than 10.12 'Sierra'."
    283279            error "unsupported platform"
    284280        }
     
    586582    }
    587583
     584    # on Leopard and Snow Leopard with libc++ForOlderSystems
     585    # installed, SDK must be unset as we can only use system libraries
     586    # also, a missing library link must be replaced for build to
     587    # succeed: <https://trac.macports.org/ticket/51844>
     588    platform darwin {
     589        if {${os.major} == 9 || ${os.major} == 10} {
     590            if {${configure.cxx_stdlib} eq "libc++"} {
     591                set SDK ""
     592                configure.ldflags-append "-lobjc"
     593            }
     594        }
     595    }
     596
    588597    # set the SDK, if it was found and exists
    589598
  • trunk/dports/aqua/qt4-mac/files/split_sources.prf

    r102010 r153015  
    1 # move Obective C and C++ files from SOURCES to OBJECTIVE_SOURCES
     1# move Objective C and C++ files from SOURCES to OBJECTIVE_SOURCES
    22
    33for(source, SOURCES) {
Note: See TracChangeset for help on using the changeset viewer.