[142970] trunk/dports/lang/llvm-3.8

jeremyhu at macports.org jeremyhu at macports.org
Sat Dec 12 08:00:29 PST 2015


Revision: 142970
          https://trac.macports.org/changeset/142970
Author:   jeremyhu at macports.org
Date:     2015-11-30 10:12:49 -0800 (Mon, 30 Nov 2015)
Log Message:
-----------
llvm-3.8: Build with cmake instead of autoconf

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.8/Portfile
    trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
    trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
    trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
    trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
    trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
    trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
    trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch

Added Paths:
-----------
    trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch

Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/Portfile	2015-11-30 18:12:49 UTC (rev 142970)
@@ -4,6 +4,7 @@
 PortGroup select        1.0
 PortGroup compiler_blacklist_versions 1.0
 PortGroup active_variants 1.1
+PortGroup cmake         1.0
 
 set llvm_version        3.8
 set llvm_version_no_dot 38
@@ -70,11 +71,13 @@
 set libcxx_rev          ${svn.revision}
 set clang-modernize_rev ${svn.revision}
 version                 ${llvm_version}-r${svn.revision}
+revision                1
 worksrcdir              trunk
 svn.url                 https://llvm.org/svn/llvm-project/llvm/trunk
 #worksrcdir              release_${llvm_version_no_dot}
 #svn.url                 https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
 default_variants-append +assertions
+default_variants-append +debug
 
 #version                 ${llvm_version}.0
 #epoch                   1
@@ -119,6 +122,7 @@
         2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
         2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
         2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
+        2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch \
         3001-buildit-build-fix-for-Leopard.patch \
         3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
@@ -130,26 +134,30 @@
     # present, but we used to explicitly only use this patch for the llvm subport.
     patchfiles-delete \
         0005-MacPorts-Only-Skip-checking-for-python-in-configure.patch
-
-    build.target        clang-only
-    destroot.target     install-clang
 }
 
-build.env-append        VERBOSE=1 \
-                        REQUIRES_RTTI=1
-destroot.env-append     VERBOSE=1 \
-                        REQUIRES_RTTI=1
+configure.post_args         ../${worksrcdir}
+default configure.dir       {${workpath}/build}
+default build.dir           {${workpath}/build}
 
-configure.dir           ${workpath}/build
-build.dir               ${configure.dir}
+# https://llvm.org/bugs/show_bug.cgi?id=25664
+configure.ldflags-append    -Wl,-rpath, at loader_path
 
-configure.cmd           ${worksrcpath}/configure
-configure.pre_args-delete --prefix=${prefix}
-configure.args          --enable-bindings=none --enable-libffi --enable-shared --enable-jit \
-                        --enable-optimized --disable-profiling --enable-pic \
-                        --enable-debug-symbols --disable-debug-runtime \
-                        --prefix="${sub_prefix}" --disable-assertions
+# https://llvm.org/bugs/show_bug.cgi?id=25674
+configure.cxxflags-append   -std=c++11
 
+configure.args-append \
+    -DLLVM_BUILD_LLVM_DYLIB=ON \
+    -DCMAKE_INSTALL_PREFIX="${sub_prefix}" \
+    -DLLVM_ENABLE_ASSERTIONS=OFF \
+    -DLLVM_ENABLE_RTTI=ON \
+    -DLLVM_INCLUDE_TESTS=OFF \
+    -DLLVM_INCLUDE_EXAMPLES=OFF \
+    -DLLVM_ENABLE_FFI=ON \
+    -DLLVM_BINDINGS_LIST=none \
+    -DFFI_INCLUDE_DIR=${prefix}/include \
+    -DFFI_LIBRARY_DIR=${prefix}/lib
+
 if {${subport} eq "llvm-${llvm_version}"} {
     select.group        llvm
     select.file         ${filespath}/mp-${subport}
@@ -157,7 +165,15 @@
     select.group        clang
     select.file         ${filespath}/mp-${subport}
 
-    configure.args-append --with-python=${prefix}/bin/python2.7 --disable-clang-static-analyzer
+    configure.args-append \
+        -DCLANG_INCLUDE_TESTS=OFF \
+        -DCLANG_ENABLE_STATIC_ANALYZER=OFF
+
+    # https://llvm.org/bugs/show_bug.cgi?id=25665
+    configure.args-append \
+        -DLLVM_BUILD_RUNTIME=ON \
+        -DLIBCXX_INSTALL_LIBRARY=OFF \
+        -DLIBCXX_ENABLE_SHARED=OFF
 }
 
 # llvm-3.5 and later requires a C++11 runtime
@@ -200,13 +216,6 @@
 }
 
 variant universal {
-    build.env-append \
-        UNIVERSAL=1 \
-        UNIVERSAL_ARCH="[get_canonical_archs]"
-    destroot.env-append \
-        UNIVERSAL=1 \
-        UNIVERSAL_ARCH="[get_canonical_archs]"
-
     post-extract {
         # workaround a bug in Apple's shipped gcc driver-driver, patched in
         # ours with driverdriver-num_infiles.patch
@@ -219,29 +228,20 @@
 }
 
 variant assertions description "Enable assertions for error detection (has performance impacts, especially on JIT)" {
-    configure.args-delete --disable-assertions
-    configure.args-append --enable-assertions
+    configure.args-delete -DLLVM_ENABLE_ASSERTIONS=OFF
+    configure.args-append -DLLVM_ENABLE_ASSERTIONS=ON
 }
 
 platform darwin {
-    if {${build_arch} eq "i386"} {
-        configure.pre_args-append --build=i686-apple-darwin${os.major}
-    } elseif {${build_arch} eq "ppc"} {
-        configure.pre_args-append --build=powerpc-apple-darwin${os.major}
-    } elseif {${build_arch} eq "ppc64"} {
-        configure.pre_args-append --build=powerpc64-apple-darwin${os.major}
-    } else {
-        configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
-    }
-
     if {[string match "*ppc*" [get_canonical_archs]]} {
         # http://trac.macports.org/ticket/33987
-        configure.args-append --with-optimize-option=-Os
         configure.optflags    -Os
     }
 
     if {${subport} eq "clang-${llvm_version}" && [vercmp $xcodeversion 5.0] < 0} {
+        # https://llvm.org/bugs/show_bug.cgi?id=13671
         patchfiles-append leopard-no-asan.patch
+        configure.args-append -DCOMPILER_RT_HAS_SANITIZER_COMMON=NO
     }
 
     if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 9} {
@@ -251,7 +251,7 @@
     if {${os.major} < 11} {
         # Proxy for eliminating the dependency on native TLS
         # http://trac.macports.org/ticket/46887
-        configure.args-append --disable-backtraces
+        configure.args-append -DLLVM_ENABLE_BACKTRACES=OFF
     }
 }
 
@@ -288,18 +288,18 @@
     }
 }
 
-post-patch {
-    if {${subport} eq "clang-${llvm_version}"} {
-        reinplace "s|@@PREFIX@@|${prefix}|g" \
-            ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk \
-            ${worksrcpath}/projects/compiler-rt/make/platform/clang_macho_embedded.mk
+if {${subport} eq "clang-${llvm_version}"} {
+    destroot {
+        system "cd ${destroot.dir}/tools/clang && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+        system "cd ${destroot.dir}/projects/compiler-rt && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+        system "cd ${destroot.dir}/projects/libcxx && ${destroot.cmd} ${destroot.pre_args} ${destroot.target} ${destroot.post_args}"
+
+        delete ${destroot}${sub_prefix}/bin/clang
+        file rename ${destroot}${sub_prefix}/bin/clang-${llvm_version} ${destroot}${sub_prefix}/bin/clang
     }
 }
 
 post-destroot {
-    file mkdir ${destroot}${prefix}/share/doc
-    file rename ${destroot}${sub_prefix}/docs/llvm ${destroot}${prefix}/share/doc/${subport}
-
     foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
         set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}
         set exec_path [string map "${destroot}${sub_prefix} ${sub_prefix}" ${bin}]
@@ -314,6 +314,11 @@
         #    set basename [string map "${destroot}${sub_prefix}/share/man/man1/ {}" ${man}]
         #    file rename ${man} ${destroot}${prefix}/share/man/man1/[string map ".1 -${suffix}.1" ${basename}]
         #}
+
+        # https://llvm.org/bugs/show_bug.cgi?id=19465
+        if {[variant_isset polly]} {
+            ln -s LLVMPolly.so ${destroot}${sub_prefix}/lib/LLVMPolly.dylib
+        }
     } elseif {${subport} eq "clang-${llvm_version}"} {
         system "ditto ${worksrcpath}/projects/libcxx/include ${destroot}${sub_prefix}/lib/c++/v1"
 
@@ -330,8 +335,8 @@
     variant ocaml description {Enable generation of OCaml binding} {
         depends_lib-append   port:ocaml
 
-        configure.args-delete --enable-bindings=none
-        configure.args-append --enable-bindings=ocaml
+        configure.args-delete -DLLVM_BINDINGS_LIST=none
+        configure.args-append -DLLVM_BINDINGS_LIST=ocaml
 
         destroot.args-append  OVERRIDE_libdir=${sub_prefix}/lib
     }
@@ -345,8 +350,10 @@
     }
 
     variant analyzer description {Install clang static analyzer} {
-        configure.args-delete --disable-clang-static-analyzer
-        configure.args-append --enable-clang-static-analyzer
+        configure.args-delete \
+            -DCLANG_ENABLE_STATIC_ANALYZER=OFF
+        configure.args-append \
+            -DCLANG_ENABLE_STATIC_ANALYZER=ON
 
         depends_run-append port:perl5
 
@@ -359,27 +366,11 @@
                 ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
                 ${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
         }
-
-        post-destroot {
-            file mkdir ${destroot}${sub_prefix}/libexec
-            file copy ${worksrcpath}/tools/clang/tools/scan-build ${destroot}${sub_prefix}/libexec/scan-build
-            file copy ${worksrcpath}/tools/clang/tools/scan-view ${destroot}${sub_prefix}/libexec/scan-view
-
-            ln -s ${sub_prefix}/libexec/scan-build/bin/scan-build ${destroot}${sub_prefix}/bin/scan-build
-            ln -s ${sub_prefix}/libexec/scan-view/bin/scan-view ${destroot}${sub_prefix}/bin/scan-view
-            ln -s ${sub_prefix}/bin/clang ${destroot}${sub_prefix}/libexec/scan-build/bin/clang
-
-            xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
-            reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
-
-            xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-view-${suffix}"
-            reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-view:" "${destroot}${prefix}/bin/scan-view-${suffix}"
-        }
     }
 
     variant openmp description {Use MacPorts' provided libomp with -fopenmp} {
-        configure.args-append \
-            --with-clang-default-openmp-runtime=libomp
+        configure.args-append   -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
         depends_lib-append      port:libomp
         patchfiles-append       openmp-locations.patch
 

Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From 50fb9417b3c687ee774bbce476665c294694f8aa Mon Sep 17 00:00:00 2001
+From 2d2c241cda3099ec3900ee2924201d3d19eea69e Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2006] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2007] MacPorts Only: Comment out SL cctools workaround
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 ---
@@ -30,5 +30,5 @@
  # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
  # are intended to support and limit what we try to build to that.
 -- 
-2.6.2
+2.6.3
 

Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From 59e78b2ee11d1f17dbc8375a9b19e042d4726805 Mon Sep 17 00:00:00 2001
+From 1f0a6b8bdd5b4e4d00eb039f4ebd9dc0a703c091 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2006] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2007] Update CheckArches to fallback on Intel/ppc if ld
  -v doesn't report supported architectures
 
 Older versions of ld64 (eg: Xcode 3.x) do not report this.
@@ -28,5 +28,5 @@
              -integrated-as \
              $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
 -- 
-2.6.2
+2.6.3
 

Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From 88513020c3551b89e0b0fd5d72632dc5cff68794 Mon Sep 17 00:00:00 2001
+From 4d677715aded5099cadcb7c647729d05a7126930 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2006] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2007] Fall back on xcodebuild -sdk when xcrun --sdk is
  not supported
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -25,5 +25,5 @@
      fi; \
      echo $$result)
 -- 
-2.6.2
+2.6.3
 

Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From c60d1653bc6cb8d3f79cb5054a1024f06363174d Mon Sep 17 00:00:00 2001
+From efbd8b49c0815fa8a83f8d4cef51e8d0de3cbfad Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sat, 17 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2004/2006] On darwin, build ppc slices of the compiler runtime
+Subject: [PATCH 2004/2007] On darwin, build ppc slices of the compiler runtime
  if requested and supported by the SDK and toolchain
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -51,5 +51,5 @@
  UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios,$(IOSSIM_SDK))
  UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
 -- 
-2.6.2
+2.6.3
 

Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From a5e3429759eb0f15bbd576d6c96355ea72378fd9 Mon Sep 17 00:00:00 2001
+From 1c58350ef60e7b54d8b0ef6ea58791d6e8390b90 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Wed, 14 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2005/2006] MacPorts Only: Don't build x86_64h slice of
+Subject: [PATCH 2005/2007] MacPorts Only: Don't build x86_64h slice of
  compiler-rt
 
 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -52,5 +52,5 @@
  Configs += ubsan_iossim_dynamic
  UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
 -- 
-2.6.2
+2.6.3
 

Modified: trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -1,7 +1,7 @@
-From fadf6c4a22a7d8a6a99acb05175669b68b8b317b Mon Sep 17 00:00:00 2001
+From 7664b6e22365f91d330bf10f3255ad4190410000 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
 Date: Sun, 11 Oct 2015 09:02:26 -0700
-Subject: [PATCH 2006/2006] MacPorts Only: Fix regression introduced when
+Subject: [PATCH 2006/2007] MacPorts Only: Fix regression introduced when
  fixing PR24776
 
 Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
@@ -25,5 +25,5 @@
              $(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \
              -isysroot $(3) \
 -- 
-2.6.2
+2.6.3
 

Added: trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch	                        (rev 0)
+++ trunk/dports/lang/llvm-3.8/files/2007-MacPorts-Only-Don-t-check-for-the-macosx.internal-SD.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -0,0 +1,42 @@
+From 4cf3736c2a21e608d12b0fc153533be359029d7b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Mon, 30 Nov 2015 00:52:14 -0500
+Subject: [PATCH 2007/2007] MacPorts Only: Don't check for the macosx.internal
+ SDK
+
+https://llvm.org/bugs/show_bug.cgi?id=25677
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ cmake/Modules/CompilerRTDarwinUtils.cmake | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+index 4947ae4..611756a 100644
+--- llvm_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
++++ macports_master/projects/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+@@ -2,21 +2,12 @@
+ # set the default Xcode to use. This function finds the SDKs that are present in
+ # the current Xcode.
+ function(find_darwin_sdk_dir var sdk_name)
+-  # Let's first try the internal SDK, otherwise use the public SDK.
+-  execute_process(
+-    COMMAND xcodebuild -version -sdk ${sdk_name}.internal Path
+-    OUTPUT_VARIABLE var_internal
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    ERROR_FILE /dev/null
+-  )
+-  if("" STREQUAL "${var_internal}")
+     execute_process(
+       COMMAND xcodebuild -version -sdk ${sdk_name} Path
+       OUTPUT_VARIABLE var_internal
+       OUTPUT_STRIP_TRAILING_WHITESPACE
+       ERROR_FILE /dev/null
+     )
+-  endif()
+   set(${var} ${var_internal} PARENT_SCOPE)
+ endfunction()
+ 
+-- 
+2.6.3
+

Modified: trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch	2015-11-30 18:08:43 UTC (rev 142969)
+++ trunk/dports/lang/llvm-3.8/files/leopard-no-asan.patch	2015-11-30 18:12:49 UTC (rev 142970)
@@ -46,3 +46,15 @@
  RuntimeLibrary.macho_embedded.Configs := \
  	hard_static.a hard_pic.a
  ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
+--- a/projects/compiler-rt/cmake/config-ix.cmake	2015-11-29 22:17:04.000000000 -0800
++++ b/projects/compiler-rt/cmake/config-ix.cmake	2015-11-29 22:19:16.000000000 -0800
+@@ -313,9 +313,6 @@ if(APPLE)
+     else()
+       set(SANITIZER_MIN_OSX_VERSION 10.9)
+     endif()
+-    if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7")
+-      message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}")
+-    endif()
+   endif()
+ 
+   # We're setting the flag manually for each target OS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/708beac1/attachment-0001.html>


More information about the macports-changes mailing list