Ticket #50509: Portfile.diff

File Portfile.diff, 2.1 KB (added by howarth.at.macports@…, 9 years ago)

switch build to use LLVM_LINK_LLVM_DYLIB and remove unnecessary openmp variant

  • Portfile

    old new  
    5454                        that can be built using the Clang frontend as a \
    5555                        library to parse C/C++ code.
    5656
    57     depends_lib         port:libxml2 port:llvm-${llvm_version} port:python27
     57    depends_lib         port:libomp port:libxml2 port:llvm-${llvm_version} port:python27
    5858    depends_run         port:clang_select port:ld64
    5959    depends_extract     bin:svn:subversion
    6060    depends_build-append port:cctools
     
    6969}
    7070
    7171fetch.type              svn
    72 svn.revision            259341
     72svn.revision            260693
    7373
    7474set compiler_rt_rev     ${svn.revision}
    7575set libcxx_rev          ${svn.revision}
     
    133133        3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
    134134        3004-Fix-missing-long-long-math-prototypes-when-using-the.patch \
    135135        3005-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
    136         compiler_rt-toolchain.patch
     136        compiler_rt-toolchain.patch \
     137        openmp-locations.patch
    137138
    138139    # I'm not sure if we need to delete this.  It seems to build fine with it
    139140    # present, but we used to explicitly only use this patch for the llvm subport.
     
    162163configure.ldflags-append    -Wl,-rpath,@loader_path
    163164
    164165configure.args-append \
    165     -DLLVM_BUILD_LLVM_DYLIB=ON \
     166    -DLLVM_LINK_LLVM_DYLIB=ON \
    166167    -DCMAKE_INSTALL_PREFIX="${sub_prefix}" \
    167168    -DLLVM_ENABLE_ASSERTIONS=OFF \
    168169    -DLLVM_ENABLE_RTTI=ON \
     
    390391        }
    391392    }
    392393
    393     variant openmp description {Use MacPorts' provided libomp with -fopenmp} {
    394         configure.args-append   -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
    395 
    396         depends_lib-append      port:libomp
    397         patchfiles-append       openmp-locations.patch
    398 
    399         post-patch {
    400             reinplace "s|@@PREFIX@@|${prefix}|" \
    401                 ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
    402         }
     394    post-patch {
     395        reinplace "s|@@PREFIX@@|${prefix}|" \
     396            ${worksrcpath}/tools/clang/lib/Driver/Tools.cpp
    403397    }
    404398
    405399    post-patch {