Ticket #50509: Portfile.diff

Portfile

@@ -54 +54 @@
                         that can be built using the Clang frontend as a \
                         library to parse C/C++ code.
 
-    depends_lib         port:libxml2 port:llvm-${llvm_version} port:python27
+    depends_lib         port:libomp port:libxml2 port:llvm-${llvm_version} port:python27
     depends_run         port:clang_select port:ld64
     depends_extract     bin:svn:subversion
     depends_build-append port:cctools
@@ -69 +69 @@
 }
 
 fetch.type              svn
-svn.revision            259341
+svn.revision            260693
 
 set compiler_rt_rev     ${svn.revision}
 set libcxx_rev          ${svn.revision}
@@ -133 +133 @@
         3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
         3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
         3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
-        compiler_rt-toolchain.patch
+        compiler_rt-toolchain.patch \
+        openmp-locations.patch
 
     # I'm not sure if we need to delete this.  It seems to build fine with it
     # present, but we used to explicitly only use this patch for the llvm subport.
@@ -162 +163 @@
 configure.ldflags-append    -Wl,-rpath,@loader_path
 
 configure.args-append \
-    -DLLVM_BUILD_LLVM_DYLIB=ON \
+    -DLLVM_LINK_LLVM_DYLIB=ON \
     -DCMAKE_INSTALL_PREFIX="${sub_prefix}" \
     -DLLVM_ENABLE_ASSERTIONS=OFF \
     -DLLVM_ENABLE_RTTI=ON \
@@ -390 +391 @@
         }
     }
 
-    variant openmp description {Use MacPorts' provided libomp with -fopenmp} {
-        configure.args-append   -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-        depends_lib-append      port:libomp
-        patchfiles-append       openmp-locations.patch
-
-        post-patch {
-            reinplace "s|@@PREFIX@@|${prefix}|" \
-                ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
-        }
+    post-patch {
+        reinplace "s|@@PREFIX@@|${prefix}|" \
+            ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
     }
 
     post-patch {