[122339] trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

jeremyhu at macports.org jeremyhu at macports.org
Mon Jul 21 00:45:04 PDT 2014


Revision: 122339
          https://trac.macports.org/changeset/122339
Author:   jeremyhu at macports.org
Date:     2014-07-21 00:45:03 -0700 (Mon, 21 Jul 2014)
Log Message:
-----------
cmake-1.0: Set sysroot to / when the configure.sdkroot is unset.  Requires cmake r122338 change as well.

Revision Links:
--------------
    https://trac.macports.org/changeset/122338

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/cmake-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2014-07-21 07:43:31 UTC (rev 122338)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2014-07-21 07:45:03 UTC (rev 122339)
@@ -118,26 +118,7 @@
         if {${configure.sdkroot} != ""} {
             configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
         } else {
-            # cmake seems to be unable to support building against / with a deployment target set:
-            #
-            #    "Either set CMAKE_OSX_SYSROOT to a valid SDK or set CMAKE_OSX_DEPLOYMENT_TARGET to empty."
-            #
-            # For now, fall back on an SDK, but this is a horrible workaround and needs to be fixed.
-            # http://trac.macports.org/ticket/44125
-
-            if {[vercmp $xcodeversion 4.3] < 0} {
-                set sdks_dir ${developer_dir}/SDKs
-            } else {
-                set sdks_dir ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs
-            }
-            if {${configure.sdk_version} eq "10.4"} {
-                set sdk ${sdks_dir}/MacOSX10.4u.sdk
-            } else {
-                set sdk ${sdks_dir}/MacOSX${configure.sdk_version}.sdk
-            }
-
-            configure.args-append \
-                -DCMAKE_OSX_SYSROOT="${sdk}"
+            configure.args-append -DCMAKE_OSX_SYSROOT="/"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140721/fd0ec215/attachment.html>


More information about the macports-changes mailing list