Index: Mk/Uses/llvm.mk =================================================================== --- Mk/Uses/llvm.mk +++ Mk/Uses/llvm.mk @@ -1,6 +1,6 @@ # Provides support to depend on LLVM # -# USES=llvm supports two kinds of arguments: +# USES=llvm supports three kinds of arguments: # # * mode # : defaults to build @@ -14,6 +14,11 @@ # min=number: use specified min if ${LLVM_DEFAULT} is lower # max=number: use specified max if ${LLVM_DEFAULT} is higher # +# * forced dependency +# defaults to not adding build- and run-time dependencies +# when base clang is newer than calculated ${LLVM_VERSION} +# force adds dependencies, ignoring the base llvm version +# # An example usage might be: # USES= llvm # or @@ -36,6 +41,12 @@ _LLVM_MK_VALID_CONSTRAINTS= min max _LLVM_MK_VALID_MODES= build run lib +_USES_POST+= llvm +.endif + +.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LLVM_MK_POST) +_INCLUDE_USES_LLVM_MK_POST= yes + # === parse mode arguments === _LLVM_MK_MODES= # empty . for _mode in ${_LLVM_MK_VALID_MODES} @@ -86,6 +97,9 @@ . endif . endif +# === parse force argument === +_LLVM_MK_FORCE_DEPENDENCY= ${llvm_ARGS:Mforce} + # === define helpers for the dependencies === . for _ver in ${_LLVM_MK_VALID_VERSIONS:N1[0-9]} _LLVM_MK_SUFFIX_${_ver}= ${_ver}0 @@ -101,6 +115,19 @@ _LLVM_MK_PATH= llvm-config${_LLVM_MK_SUFFIX_${_LLVM_MK_VERSION}} _LLVM_MK_PREFIX= ${PREFIX}/llvm${_LLVM_MK_SUFFIX_${_LLVM_MK_VERSION}} +# === get base version of clang, and filter dependencies out === +_LLVM_MK_BASE_VERSION!= /usr/bin/clang -v 2>&1 | head -n1 | sed -r 's|^.*version ([0-9]+)\..*|\1|' +. if empty(_LLVM_MK_FORCE_DEPENDENCY) && ${_LLVM_MK_BASE_VERSION} >= ${_LLVM_MK_VERSION} +. for _mode in build run +. if !empty(_LLVM_MK_MODES:M${_mode}) +_LLVM_MK_MODES:= ${_LLVM_MK_MODES:N${_mode}} +DEV_WARNING+= Not adding llvm:${_mode},${LLVM_VERSION} as base llvm is at ${_LLVM_MK_BASE_VERSION}. +_LLVM_MK_PORT= base +_LLVM_MK_VERSION= ${_LLVM_MK_BASE_VERSION} +. endif +. endfor +. endif + # == add actual dependencies === _LLVM_MK_PATH_lib= ${_LLVM_MK_LIBLLVM} . for _mode in ${_LLVM_MK_MODES} Index: audio/faust/Makefile =================================================================== --- audio/faust/Makefile +++ audio/faust/Makefile @@ -9,7 +9,6 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt -LIB_DEPENDS= libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} RUN_DEPENDS= bash:shells/bash USES= compiler:c++14-lang cmake llvm:min=15,lib ncurses python pkgconfig shebangfix # llvm: versions <11 lacked dump() function(s) that cause unresolved symbols in libfaust.so @@ -24,10 +23,9 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/build CMAKE_ON= INCLUDE_DYNAMIC # only installs headers and not libs without INCLUDE_DYNAMIC or INCLUDE_STATIC: https://github.com/grame-cncm/faust/issues/553 -CMAKE_ARGS= -C ${FILESDIR}/backends.cmake -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \ - +CMAKE_ARGS= -C ${FILESDIR}/backends.cmake -DLLVM_CONFIG=${LLVM_CONFIG} CXXFLAGS+= -I${WRKSRC}/compiler/generator/cpp # fatal error: 'cpp_code_container.hh' file not found WHEN INCLUDE_STATIC=TRUE -CXXFLAGS+= `llvm-config${LLVM_VERSION} --cflags` -DLLVM_${LLVM_VERSION}0 # for the llvm backend +CXXFLAGS+= `${LLVM_CONFIG} --cflags` -DLLVM_${LLVM_VERSION}0 # for the llvm backend CXXFLAGS_riscv64= -fPIC # attempt to fix failure: can't create dynamic relocation R_RISCV_HI20 against symbol: vtable for LV2UI in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output LDFLAGS+= -lexecinfo Index: cad/horizon-eda/Makefile =================================================================== --- cad/horizon-eda/Makefile +++ cad/horizon-eda/Makefile @@ -25,7 +25,7 @@ libzip.so:archivers/libzip \ libzmq.so:net/libzmq4 -USES= gmake gnome libarchive localbase pkgconfig python:build sqlite # compiler:c++17-lang +USES= gmake gnome libarchive llvm:min=12 localbase pkgconfig python:build sqlite # compiler:c++17-lang USE_GNOME= atkmm gdkpixbuf2 gtkmm30 librsvg2 USE_GITHUB= yes @@ -35,8 +35,6 @@ BINARY_ALIAS= python3=${PYTHON_CMD} -LLVM_VER= 12 # workaround for bug#263870 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CPP= clang-cpp${LLVM_VER} CC= clang${LLVM_VER} CXX= clang++${LLVM_VER} Index: cad/nvc/Makefile =================================================================== --- cad/nvc/Makefile +++ cad/nvc/Makefile @@ -14,15 +14,14 @@ BROKEN_armv7= compilation fails: no member named '_gregs' in 'mcontext_t'; did you mean '__gregs', see https://github.com/nickg/nvc/issues/534 BROKEN_FreeBSD_14_i386= clang creashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265826 -BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} \ +RUN_DEPENDS= \ bash:shells/bash TEST_DEPENDS= check>0:devel/check .if !exists(/usr/include/unwind.h) LIB_DEPENDS= libunwind.so:devel/libunwind .endif -USES= autoreconf compiler:c++14-lang localbase pkgconfig shebangfix +USES= autoreconf compiler:c++14-lang llvm:min=13,build,run localbase pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= nickg @@ -40,7 +39,6 @@ MAKE_ARGS= CFLAGS="${CFLAGS}" # only for tests -LLVM_VERSION= ${LLVM_DEFAULT} # outsource build is required by the project BUILD_DIR= ${WRKSRC}/.build Index: databases/arrow/Makefile =================================================================== --- databases/arrow/Makefile +++ databases/arrow/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs -USES= cmake compiler:c++11-lang localbase pkgconfig python:build +USES= cmake compiler:c++11-lang llvm localbase pkgconfig python:build USE_LDCONFIG= yes WRKSRC_SUBDIR= cpp @@ -85,7 +85,6 @@ GANDIVA_DESC= Gandiva libraries GANDIVA_USES= ssl GANDIVA_CMAKE_BOOL= ARROW_GANDIVA -GANDIVA_BUILD_DEPENDS= ${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12 GANDIVA_LIB_DEPENDS= libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ Index: databases/clickhouse/Makefile =================================================================== --- databases/clickhouse/Makefile +++ databases/clickhouse/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash -USES= cmake cpe localbase perl5 python shebangfix +USES= cmake cpe llvm localbase perl5 python shebangfix USE_PERL5= build CPE_VENDOR= yandex @@ -232,7 +232,6 @@ .if ${OSVERSION} < 1400000 CC= clang13 CXX= clang++13 -BUILD_DEPENDS+= clang++13:devel/llvm13 .else CC= clang CXX= clang++ Index: databases/postgresql15-server/Makefile =================================================================== --- databases/postgresql15-server/Makefile +++ databases/postgresql15-server/Makefile @@ -21,7 +21,7 @@ OPTIONS_SUB= yes PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} -USES+= tar:bzip2 cpe +USES+= llvm:min=14,build,run tar:bzip2 cpe .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes @@ -226,9 +226,6 @@ .if ${PORT_OPTIONS:MLLVM} CONFIGURE_ARGS+= --with-llvm -BUILD_DEPENDS+= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION} -BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} -RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} .endif @@ -250,14 +247,11 @@ .if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION} # LLVM versions in ports are, in order, 70, 80 90, 10, 11, 12... where 10 > 90. [sic] . if ${LLVM_PORT_SUFFIX} < 70 -PG_LLVM_VERSION=${LLVM_PORT_SUFFIX} PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} . else -PG_LLVM_VERSION=11 PG_COMPILER_VERSION=11 . endif .else -PG_LLVM_VERSION=${LLVM_DEFAULT} PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX} .endif Index: databases/redisjson/Makefile =================================================================== --- databases/redisjson/Makefile +++ databases/redisjson/Makefile @@ -13,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror pkg-mirror auto-accept -BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT} -USES= cargo +USES= cargo llvm USE_GITHUB= yes GH_ACCOUNT= RedisJSON GH_PROJECT= RedisJSON Index: databases/xtrabackup/Makefile =================================================================== --- databases/xtrabackup/Makefile +++ databases/xtrabackup/Makefile @@ -26,7 +26,7 @@ libgpg-error.so:security/libgpg-error RUN_DEPENDS= qpress:archivers/qpress -USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \ +USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang llvm:min=10 \ cpe gettext libtool perl5 shebangfix USE_CXXSTD= c++11 @@ -48,8 +48,6 @@ # a backport of amongst other tings: # https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50 .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 -_LLVM_VERSION= 10 -BUILD_DEPENDS+= clang${_LLVM_VERSION}:devel/llvm${_LLVM_VERSION} CC= ${LOCALBASE}/bin/clang${_LLVM_VERSION} CXX= ${LOCALBASE}/bin/clang++${_LLVM_VERSION} .endif Index: devel/cloudabi-toolchain/Makefile =================================================================== --- devel/cloudabi-toolchain/Makefile +++ devel/cloudabi-toolchain/Makefile @@ -11,8 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ - lld${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ +RUN_DEPENDS= \ pkgconf:devel/pkgconf CONFLICTS= cloudabi-binutils Index: devel/concurrencpp/Makefile =================================================================== --- devel/concurrencpp/Makefile +++ devel/concurrencpp/Makefile @@ -12,7 +12,7 @@ BROKEN_FreeBSD_12= fatal error: 'semaphore' file not found (missing C++ include ) -USES= cmake compiler:c++20-lang +USES= cmake compiler:c++20-lang llvm USE_GITHUB= yes GH_ACCOUNT= David-Haim @@ -22,7 +22,6 @@ .include .if (${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc) && ${OSVERSION} < 1300523 -BUILD_DEPENDS= llvm13>0:devel/llvm13 CPP= ${LOCALBASE}/bin/clang-cpp13 CC= ${LOCALBASE}/bin/clang13 CXX= ${LOCALBASE}/bin/clang++13 Index: devel/cpp2py/Makefile =================================================================== --- devel/cpp2py/Makefile +++ devel/cpp2py/Makefile @@ -16,12 +16,10 @@ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_DEPENDS} \ - llvm${LLVM_VER}>0:devel/llvm${LLVM_VER} -RUN_DEPENDS= ${PY_DEPENDS} \ - llvm${LLVM_VER}>0:devel/llvm${LLVM_VER} +BUILD_DEPENDS= ${PY_DEPENDS} +RUN_DEPENDS= ${PY_DEPENDS} -USES= cmake compiler:c++14-lang gettext-runtime python:3.7+ shebangfix +USES= cmake compiler:c++14-lang gettext-runtime llvm:min=10,build,run python:3.7+ shebangfix USE_LDCONFIG= yes USE_GITHUB= yes @@ -32,7 +30,6 @@ CMAKE_ARGS= -DPYTHON_INTERPRETER:STRING=${PYTHON_CMD} \ -DFREEBSD_LLVM_VER:STRING=${LLVM_VER} -LLVM_VER= 10 PORTSCOUT= limit:^[0-9\.]*$$ Index: devel/cquery/Makefile =================================================================== --- devel/cquery/Makefile +++ devel/cquery/Makefile @@ -10,9 +10,8 @@ LICENSE= MIT -LIB_DEPENDS= libclang.so:devel/llvm${LLVM_DEFAULT} -USES= compiler:c++14-lang cmake +USES= compiler:c++14-lang cmake llvm:lib USE_GITHUB= yes GH_ACCOUNT= cquery-project Index: devel/creduce/Makefile =================================================================== --- devel/creduce/Makefile +++ devel/creduce/Makefile @@ -7,9 +7,7 @@ COMMENT= Produces small test cases WWW= https://embed.cs.utah.edu/creduce/ -LLVM_VER= 80 -BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} \ +RUN_DEPENDS= \ topformflat:devel/delta \ astyle:devel/astyle \ p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \ @@ -27,7 +25,7 @@ CXX=${LOCALBASE}/bin/clang++${LLVM_VER} \ CPP=${LOCALBASE}/bin/clang-cpp${LLVM_VER} -USES= autoreconf compiler gmake libtool perl5 +USES= autoreconf compiler gmake libtool llvm:min=80,build,run perl5 CFLAGS_powerpc64= -mabi=elfv2 Index: devel/cvise/Makefile =================================================================== --- devel/cvise/Makefile +++ devel/cvise/Makefile @@ -13,13 +13,11 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pebble>0:devel/py-pebble@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ - llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} + ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}pebble>0:devel/py-pebble@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ - llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} + ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0:devel/py-pytest-flake8@${PY_FLAVOR} # gcc:lang/gcc @@ -29,10 +27,9 @@ # once this is installed, all tests pass for me: # 260 passed, 1 skipped in 64.82 seconds -USES= cmake python:3.6+ shebangfix +USES= cmake llvm:min=13,build,run python:3.6+ shebangfix CMAKE_ARGS+= -DLLVM_DIR:PATH=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm CMAKE_ARGS+= -DClang_DIR:PATH=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang -LLVM_VER= 13 SHEBANG_FILES= cvise-delta.py cvise.py USE_GITHUB= yes GH_ACCOUNT= marxin Index: devel/electron18/Makefile =================================================================== --- devel/electron18/Makefile +++ devel/electron18/Makefile @@ -58,7 +58,7 @@ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm-node16>0:www/npm-node16 -USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv \ +USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv llvm \ jpeg localbase:ldflags ninja pkgconfig python:build,test \ shebangfix tar:xz xorg CPE_VENDOR= electronjs @@ -189,7 +189,6 @@ .if ${COMPILER_VERSION} < 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: devel/electron19/Makefile =================================================================== --- devel/electron19/Makefile +++ devel/electron19/Makefile @@ -59,7 +59,7 @@ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm-node16>0:www/npm-node16 -USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv \ +USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv llvm \ jpeg localbase:ldflags ninja pkgconfig python:build,test \ shebangfix tar:xz xorg CPE_VENDOR= electronjs @@ -190,7 +190,6 @@ .if ${COMPILER_VERSION} < 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: devel/electron21/Makefile =================================================================== --- devel/electron21/Makefile +++ devel/electron21/Makefile @@ -57,7 +57,7 @@ ${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \ npm-node16>0:www/npm-node16 -USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv \ +USES= bison compiler:c++17-lang cpe gettext-tools gl gnome iconv llvm \ jpeg localbase:ldflags ninja pkgconfig python:build,test \ shebangfix tar:xz xorg CPE_VENDOR= electronjs @@ -187,7 +187,6 @@ .if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: devel/emscripten/Makefile =================================================================== --- devel/emscripten/Makefile +++ devel/emscripten/Makefile @@ -9,13 +9,13 @@ LICENSE= MIT NCSA LICENSE_COMB= dual -RUN_DEPENDS= llvm-devel>0:devel/llvm-devel \ +RUN_DEPENDS= \ node:www/node \ bash:shells/bash \ binaryen>0:devel/binaryen # the upstream requires to use either the latest llvm version, or their own llvm fork called emscripten-fastcomp -USES= python shebangfix +USES= llvm:run python shebangfix USE_GITHUB= yes GH_ACCOUNT= emscripten-core SHEBANG_FILES= ${PYSCRIPTS} emcmake system/bin/sdl-config system/bin/sdl2-config Index: devel/f18/Makefile =================================================================== --- devel/f18/Makefile +++ devel/f18/Makefile @@ -12,10 +12,8 @@ ONLY_FOR_ARCHS= amd64 -BUILD_DEPENDS= llvm80>=0:devel/llvm80 -RUN_DEPENDS= llvm80>=0:devel/llvm80 -USES= cmake:noninja libedit perl5 tar:xz \ +USES= cmake:noninja libedit llvm:build,run perl5 tar:xz \ shebangfix _USES_PYTHON?= python:build USES+= ${_USES_PYTHON} Index: devel/fccf/Makefile =================================================================== --- devel/fccf/Makefile +++ devel/fccf/Makefile @@ -10,12 +10,10 @@ LICENSE= MIT -BUILD_DEPENDS= argparse>0:devel/argparse \ - llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS= argparse>0:devel/argparse LIB_DEPENDS= libfmt.so:devel/libfmt -RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -USES= cmake +USES= cmake llvm:build,run USE_GITHUB= yes GH_ACCOUNT= p-ranav Index: devel/ikos/Makefile =================================================================== --- devel/ikos/Makefile +++ devel/ikos/Makefile @@ -10,22 +10,19 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.pdf -BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} LIB_DEPENDS= libapron.so:math/apron \ libboost_system.so:devel/boost-libs \ libmpfr.so:math/mpfr \ libgmp.so:math/gmp \ libppl.so:devel/ppl \ libtbb.so:devel/onetbb -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -USES= cmake ncurses python:3.6+ sqlite +USES= cmake llvm:min=14,build,run ncurses python:3.6+ sqlite USE_GITHUB= yes GH_ACCOUNT= NASA-SW-VnV USE_LDCONFIG= yes -LLVM_VERSION= 14 # only llvm-14 is currently supported CXXFLAGS+= -DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG Index: devel/include-what-you-use/Makefile =================================================================== --- devel/include-what-you-use/Makefile +++ devel/include-what-you-use/Makefile @@ -10,11 +10,8 @@ LICENSE= NCSA LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -LLVM_VER= 14 -BUILD_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} -RUN_DEPENDS= clang${LLVM_VER}:devel/llvm${LLVM_VER} -USES= cmake compiler:c++11-lang ncurses python:3.8,run shebangfix +USES= cmake compiler:c++11-lang llvm:min=14,build,run ncurses python:3.8,run shebangfix USE_GITHUB= yes SHEBANG_FILES= fix_includes.py \ Index: devel/ispc/Makefile =================================================================== --- devel/ispc/Makefile +++ devel/ispc/Makefile @@ -15,9 +15,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ m4:devel/m4 -LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_VERSION} -USES= bison cmake compiler:c++14-lang python:build,test shebangfix +USES= bison cmake compiler:c++14-lang llvm:min=13,lib python:build,test shebangfix USE_LDCONFIG= yes USE_GITHUB= yes @@ -67,7 +66,6 @@ #LLVM_VERSION= ${LLVM_DEFAULT} #.endif -LLVM_VERSION?= 13 do-test: # all tests pass @cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py Index: devel/libclc/Makefile =================================================================== --- devel/libclc/Makefile +++ devel/libclc/Makefile @@ -13,11 +13,11 @@ LICENSE_NAME= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= llvm15>=15.0:devel/llvm15 \ +BUILD_DEPENDS= \ spirv-llvm-translator-llvm15>0:devel/spirv-llvm-translator@llvm15 \ libedit>=0:devel/libedit -USES= cmake compiler:c++11-lib python:3.6+,build tar:xz +USES= cmake compiler:c++11-lib llvm python:3.6+,build tar:xz USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} Index: devel/lua-language-server/Makefile =================================================================== --- devel/lua-language-server/Makefile +++ devel/lua-language-server/Makefile @@ -12,7 +12,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify -USES= compiler:features dos2unix lua:build ninja:make +USES= compiler:features dos2unix llvm lua:build ninja:make USE_GITHUB= yes GH_ACCOUNT= sumneko GH_TUPLE= actboy168:bee.lua:992cc57:bee/3rd/bee.lua \ @@ -37,7 +37,6 @@ .include .if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130 -BUILD_DEPENDS+= llvm13>0:devel/llvm13 CPP= ${LOCALBASE}/bin/clang-cpp13 CC= ${LOCALBASE}/bin/clang13 CXX= ${LOCALBASE}/bin/clang++13 Index: devel/mdb/Makefile =================================================================== --- devel/mdb/Makefile +++ devel/mdb/Makefile @@ -8,7 +8,7 @@ LICENSE= CDDL -USES= compiler uidfix +USES= compiler llvm uidfix USE_GITHUB= yes GH_ACCOUNT= bsdjhb @@ -34,7 +34,6 @@ .if ${OSVERSION} < 1300015 && ${COMPILER_TYPE} == "clang" && \ ${COMPILER_VERSION} >= 80 # clang 8 cannot compile due to enum redefinitions in kernel.h -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang70:devel/llvm70 CPP= ${LOCALBASE}/bin/clang-cpp70 CC= ${LOCALBASE}/bin/clang70 CXX= ${LOCALBASE}/bin/clang++70 Index: devel/oclgrind/Makefile =================================================================== --- devel/oclgrind/Makefile +++ devel/oclgrind/Makefile @@ -12,14 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LLVM_VER= 12 -BUILD_DEPENDS= opencl>=0:devel/opencl \ - llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} +BUILD_DEPENDS= opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= opencl>=0:devel/opencl \ - llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} +RUN_DEPENDS= opencl>=0:devel/opencl -USES= cmake +USES= cmake llvm:min=12,build,run USE_GITHUB= yes GH_ACCOUNT= jrprice GH_PROJECT= Oclgrind Index: devel/py-cadquery-pywrap/Makefile =================================================================== --- devel/py-cadquery-pywrap/Makefile +++ devel/py-cadquery-pywrap/Makefile @@ -24,10 +24,9 @@ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toposort>0:devel/py-toposort@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${PY_FLAVOR} \ - llvm${LLVMVER}>0:devel/llvm${LLVMVER} \ pybind11>=2.6:devel/pybind11 -USES= python:3.6+ +USES= llvm:min=10,run python:3.6+ USE_GITHUB= yes GH_ACCOUNT= CadQuery @@ -35,6 +34,5 @@ GH_TAGNAME= e8c7bc9 USE_PYTHON= autoplist concurrent distutils -LLVMVER= 10 .include Index: devel/py-llvmcpy/Makefile =================================================================== --- devel/py-llvmcpy/Makefile +++ devel/py-llvmcpy/Makefile @@ -12,13 +12,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ +RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR} -USES= python:3.6+ +USES= llvm:run python:3.6+ USE_GITHUB= yes GH_ACCOUNT= revng USE_PYTHON= distutils autoplist Index: devel/py-llvmlite/Makefile =================================================================== --- devel/py-llvmlite/Makefile +++ devel/py-llvmlite/Makefile @@ -11,17 +11,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -USES= compiler:c++11-lib python:3.6+ fortran +USES= compiler:c++11-lib llvm:min=11,build,run python:3.6+ fortran USE_PYTHON= distutils autoplist pytest CXXFLAGS= -fPIC MAKE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} -LLVM_VER= 11 # see the compatibility table https://github.com/numba/llvmlite#compatibility TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} Index: devel/stack/Makefile =================================================================== --- devel/stack/Makefile +++ devel/stack/Makefile @@ -16,7 +16,7 @@ ${LOCALBASE}/lib/compat/libffi.so.6:devel/libffi321 \ ${LOCALBASE}/lib/compat/libffi.so.7:devel/libffi33 -USES= cabal gmake perl5 pkgconfig +USES= cabal gmake llvm:run perl5 pkgconfig USE_GITHUB= yes GH_ACCOUNT= commercialhaskell USE_PERL5= run @@ -203,8 +203,6 @@ .if ${ARCH} == aarch64 # Keep it in sync with LLVM_VERSION in lang/ghc* port, which is used to build this one -LLVM_VERSION= 10 -RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} .endif .if ${OSVERSION} >= 1300078 && ${ARCH} != powerpc64 Index: devel/wasi-compiler-rt11/Makefile =================================================================== --- devel/wasi-compiler-rt11/Makefile +++ devel/wasi-compiler-rt11/Makefile @@ -21,15 +21,13 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LLVM_RELEASE= ${DISTVERSION:C/rc.*//} -LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} WASI_SYSROOT= ${LOCALBASE}/share/wasi-sysroot -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \ - clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} +BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc -USES= cmake tar:xz +USES= cmake llvm:min=11 tar:xz NO_ARCH= yes PLIST_FILES= llvm${LLVM_SUFFIX}/lib/clang/${LLVM_RELEASE}/lib/wasi/libclang_rt.builtins-wasm32.a Index: devel/wasi-compiler-rt13/Makefile =================================================================== --- devel/wasi-compiler-rt13/Makefile +++ devel/wasi-compiler-rt13/Makefile @@ -18,15 +18,13 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LLVM_RELEASE= ${DISTVERSION:C/rc.*//} -LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} WASI_SYSROOT= ${LOCALBASE}/share/wasi-sysroot -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \ - clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} +BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc -USES= cmake tar:xz +USES= cmake llvm:min=13 tar:xz NO_ARCH= yes PLIST_FILES= llvm${LLVM_SUFFIX}/lib/clang/${LLVM_RELEASE}/lib/wasi/libclang_rt.builtins-wasm32.a Index: devel/wasi-libc/Makefile =================================================================== --- devel/wasi-libc/Makefile +++ devel/wasi-libc/Makefile @@ -14,15 +14,13 @@ LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -USES= gmake +USES= gmake llvm:min=13 USE_GITHUB= yes GH_ACCOUNT= WebAssembly GH_TAGNAME= ad5133410f66b93a2381db5b542aad5e0964db96 GH_TUPLE= WebAssembly:WASI:ef8c1a53fe:wasi/tools/wasi-headers/WASI NO_ARCH= yes -LLVM_VERSION?= 13 ALL_TARGET= finish Index: devel/wasi-libcxx/Makefile =================================================================== --- devel/wasi-libcxx/Makefile +++ devel/wasi-libcxx/Makefile @@ -16,17 +16,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \ - clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} +BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc -USES= cmake tar:xz +USES= cmake llvm:min=13 tar:xz NO_ARCH= yes SSP_UNSAFE= yes CC= ${LOCALBASE}/bin/clang${LLVM_SUFFIX} CXX= ${LOCALBASE}/bin/clang++${LLVM_SUFFIX} LLVM_RELEASE= ${DISTVERSION:C/rc.*//} -LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} WASI_SYSROOT= ${LOCALBASE}/share/wasi-sysroot WRKSRC= ${WRKDIR}/${DISTNAME}/libcxx Index: devel/xtoolchain-llvm-devel/Makefile =================================================================== --- devel/xtoolchain-llvm-devel/Makefile +++ devel/xtoolchain-llvm-devel/Makefile @@ -12,7 +12,6 @@ MAINTAINER?= brooks@FreeBSD.org COMMENT= Pre seeded toolchain to cross build FreeBSD base -LLVM_SUFFIX?= -devel .if ${LLVM_SUFFIX} == "-devel" IGNORE= Subsumed into devel/llvm-devel @@ -26,7 +25,6 @@ XLD?= ${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld.lld X_COMPILER_TYPE?= clang -RUN_DEPENDS?= ${XCC}:devel/llvm${LLVM_SUFFIX} SUB_FILES= xtoolchain.mk SUB_LIST= XCC=${XCC} \ Index: devel/youcompleteme/Makefile =================================================================== --- devel/youcompleteme/Makefile +++ devel/youcompleteme/Makefile @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}watchdog>0:devel/py-watchdog@${PY_FLAVOR} -USES= cmake compiler:c++11-lang python:3.6+ +USES= cmake compiler:c++11-lang llvm:lib python:3.6+ USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= ycm-core @@ -43,7 +43,6 @@ C_DESC= C-family Semantic Completion Support C_CMAKE_ON= -DPATH_TO_LLVM_ROOT=${LOCALBASE}/llvm${LLVM_DEFAULT} -C_LIB_DEPENDS= libclang.so:devel/llvm${LLVM_DEFAULT} VIMFILESDIR= ${PREFIX}/share/vim/vimfiles Index: editors/jucipp/Makefile =================================================================== --- editors/jucipp/Makefile +++ editors/jucipp/Makefile @@ -10,15 +10,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libaspell.so:textproc/aspell \ libboost_filesystem.so:devel/boost-libs \ libgit2.so:devel/libgit2 \ libharfbuzz.so:print/harfbuzz -RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ +RUN_DEPENDS= \ uctags:devel/universal-ctags -USES= cmake compiler:c++14-lang desktop-file-utils gnome pkgconfig +USES= cmake compiler:c++14-lang desktop-file-utils gnome llvm:build,run pkgconfig USE_GITLAB= yes GL_ACCOUNT= cppit GL_COMMIT= 692f3de1f0aad00051096579975e515bccc3802a Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -118,7 +118,7 @@ SHEBANG_GLOB= *.py GNU_CONFIGURE= yes -USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \ +USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils llvm \ gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig \ python:3.8+ shebangfix shared-mime-info ssl tar:xz xorg USE_GL= gl glew glu @@ -352,7 +352,6 @@ CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} LLD_UNSAFE= yes .endif Index: editors/parinfer-rust/Makefile =================================================================== --- editors/parinfer-rust/Makefile +++ editors/parinfer-rust/Makefile @@ -11,9 +11,8 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -USES= cargo +USES= cargo llvm USE_GITHUB= yes GH_ACCOUNT= eraserhd GH_TAGNAME= 211f72e3 Index: emulators/dolphin-emu/Makefile =================================================================== --- emulators/dolphin-emu/Makefile +++ emulators/dolphin-emu/Makefile @@ -42,7 +42,7 @@ libhidapi.so:comms/hidapi \ libxml2.so:textproc/libxml2 -USES= cmake compiler:c++17-lang desktop-file-utils gl iconv \ +USES= cmake compiler:c++17-lang desktop-file-utils gl iconv llvm:lib \ pkgconfig qmake qt:5 sdl xorg # See: https://fr.dolphin-emu.org/download/?ref=btn @@ -89,7 +89,6 @@ .if ${CHOSEN_COMPILER_TYPE:Mclang} CMAKE_ARGS+= -DENABLE_LLVM:BOOL=ON \ -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm -LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/}.so:devel/llvm${LLVM_DEFAULT} .else CMAKE_ARGS+= -DENABLE_LLVM:BOOL=OFF .endif Index: emulators/libretro-kronos/Makefile =================================================================== --- emulators/libretro-kronos/Makefile +++ emulators/libretro-kronos/Makefile @@ -13,7 +13,7 @@ # standalone version uses solely cmake, whereas the retroarch core uses both # cmake and gmake -USES= cmake:noninja compiler:c++11-lib gl gmake pkgconfig qt:5 sdl +USES= cmake:noninja compiler:c++11-lib gl gmake llvm:min=12 pkgconfig qt:5 sdl USE_GITHUB= yes GH_ACCOUNT= FCare @@ -46,8 +46,6 @@ .if ${CHOSEN_COMPILER_TYPE} == clang # clang13 runs out of memory -LLVM_VER= 12 -BUILD_DEPENDS+= clang++${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif Index: emulators/virtualbox-ose-legacy/Makefile =================================================================== --- emulators/virtualbox-ose-legacy/Makefile +++ emulators/virtualbox-ose-legacy/Makefile @@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 -USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 +USES= compiler:c++14-lang cpe gnome iconv llvm:min=11 pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 HAS_CONFIGURE= yes @@ -218,10 +218,8 @@ # clang > 11 included in FreeBSD 14 fails to compile this legacy version # of virtualbox-ose, force clang 11 on FreeBSD 14 where a newer clang is # included. -BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 11 .endif .if ${PYTHON_MAJOR_VER} >= 3 Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -26,7 +26,7 @@ WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= amd64 -USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 +USES= compiler:c++14-lang cpe gnome iconv llvm pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 HAS_CONFIGURE= yes @@ -214,10 +214,8 @@ # llvm10 in FreeBSD before r364284 miscompiles virtualbox 6.1 causing errors. # force llvm11 from ports .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109 -BUILD_DEPENDS+= clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} CC= clang${VBOX_LLVM_VER} CXX= clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 11 .endif PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk Index: emulators/wine-devel/Makefile =================================================================== --- emulators/wine-devel/Makefile +++ emulators/wine-devel/Makefile @@ -16,9 +16,8 @@ ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} -USES= bison cpe desktop-file-utils gmake localbase \ +USES= bison cpe desktop-file-utils gmake llvm:min=13 localbase \ pkgconfig sdl shebangfix tar:xz USE_GCC= yes USE_SDL= sdl2 @@ -125,9 +124,7 @@ .endif .if (${LLVM_DEFAULT} == 90 || ${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11) -_LLVM_VERSION= 12 .else -_LLVM_VERSION= ${LLVM_DEFAULT} .endif .if ${ARCH} == amd64 Index: emulators/wine-proton/Makefile =================================================================== --- emulators/wine-proton/Makefile +++ emulators/wine-proton/Makefile @@ -13,15 +13,14 @@ IGNORE_FreeBSD_12=requires F_ADD_SEALS ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ - llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgnutls.so:security/gnutls \ libvulkan.so:graphics/vulkan-loader -USES= autoreconf bison desktop-file-utils gettext-runtime gl gmake gnome gstreamer localbase openal pkgconfig python:build sdl shebangfix tar:xz xorg +USES= autoreconf bison desktop-file-utils gettext-runtime gl gmake gnome gstreamer llvm:min=13 localbase openal pkgconfig python:build sdl shebangfix tar:xz xorg USE_GCC= yes USE_GITHUB= yes @@ -104,9 +103,7 @@ .include .if (${LLVM_DEFAULT} == 90 || ${LLVM_DEFAULT} == 10 || ${LLVM_DEFAULT} == 11) -_LLVM_VERSION= 12 .else -_LLVM_VERSION= ${LLVM_DEFAULT} .endif .if ${ARCH} == amd64 Index: graphics/blender-lts29/Makefile =================================================================== --- graphics/blender-lts29/Makefile +++ graphics/blender-lts29/Makefile @@ -27,7 +27,7 @@ # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. -USES= cmake compiler:c++17-lang cpe gl jpeg python:3.9 shebangfix \ +USES= cmake compiler:c++17-lang cpe gl jpeg llvm:min=13,build,run python:3.9 shebangfix \ tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew @@ -90,9 +90,7 @@ CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \ -DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders" -CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage -CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} @@ -189,9 +187,7 @@ .endif .if ${LLVM_DEFAULT:M[678]0} -LLVM_VER= 90 .else -LLVM_VER= ${LLVM_DEFAULT} .endif post-build: Index: graphics/blender/Makefile =================================================================== --- graphics/blender/Makefile +++ graphics/blender/Makefile @@ -27,7 +27,7 @@ # libraries are used, if either of the most common options in blender # are set. We will pull boost in just to be on the safe side. -USES= cmake compiler:c++17-lang cpe gl jpeg llvm:min=9 \ +USES=9 \9 llvm:min=14,build,run \ python:3.10 shebangfix tar:xz xorg USE_XORG= x11 xext xfixes xmu xrender USE_GL= gl glu glew @@ -82,9 +82,7 @@ CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \ -DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders" -CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage -CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} DDS_CMAKE_BOOL= WITH_IMAGE_DDS DRACO_CMAKE_BOOL= WITH_DRACO DRACO_USE= LDCONFIG=${PYTHON_SITELIBDIR} Index: graphics/darktable/Makefile =================================================================== --- graphics/darktable/Makefile +++ graphics/darktable/Makefile @@ -33,7 +33,7 @@ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff -USES= cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg \ +USES= cmake compiler:c++14-lang desktop-file-utils gl gnome jpeg llvm \ perl5 pkgconfig sdl shebangfix sqlite tar:xz xorg USE_GL= gl USE_GNOME= cairo gtk30 intltool librsvg2 libxml2 @@ -126,7 +126,6 @@ .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD || ${ARCH} == "i386" LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} Index: graphics/dcmtk/Makefile =================================================================== --- graphics/dcmtk/Makefile +++ graphics/dcmtk/Makefile @@ -17,7 +17,7 @@ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= compiler:c++11-lang cmake cpe gnome jpeg ssl +USES= compiler:c++11-lang cmake cpe gnome jpeg llvm ssl CPE_VENDOR= offis USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} @@ -36,8 +36,6 @@ .include .if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} == 140 -LLVM_VER= 15 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif Index: graphics/libosmesa/Makefile =================================================================== --- graphics/libosmesa/Makefile +++ graphics/libosmesa/Makefile @@ -8,10 +8,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst -LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ - libglapi.so:graphics/mesa-libs +LIB_DEPENDS+= libglapi.so:graphics/mesa-libs -USES= xorg +USES= llvm:lib xorg USE_XORG= xorgproto USE_LDCONFIG= yes Index: graphics/mesa-dri/Makefile =================================================================== --- graphics/mesa-dri/Makefile +++ graphics/mesa-dri/Makefile @@ -6,8 +6,7 @@ COMMENT= OpenGL hardware acceleration drivers for DRI2+ WWW= https://www.mesa3d.org/ -LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ - libglapi.so:graphics/mesa-libs +LIB_DEPENDS+= libglapi.so:graphics/mesa-libs OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND Index: graphics/mesa-dri/Makefile.common =================================================================== --- graphics/mesa-dri/Makefile.common +++ graphics/mesa-dri/Makefile.common @@ -83,8 +83,8 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} -LLVM_DEFAULT= 15 -BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +_llvm_min= 15 +USES+= llvm:min=${_llvm_min} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib Index: graphics/mesa-gallium-va/Makefile =================================================================== --- graphics/mesa-gallium-va/Makefile +++ graphics/mesa-gallium-va/Makefile @@ -13,7 +13,6 @@ ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware LIB_DEPENDS= libva.so:multimedia/libva \ - libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libzstd.so:archivers/zstd OPTIONS_DEFINE= X11 Index: graphics/mesa-gallium-vdpau/Makefile =================================================================== --- graphics/mesa-gallium-vdpau/Makefile +++ graphics/mesa-gallium-vdpau/Makefile @@ -13,7 +13,6 @@ ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware LIB_DEPENDS= libva.so:multimedia/libva \ - libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libvdpau.so:multimedia/libvdpau \ libzstd.so:archivers/zstd Index: graphics/mesa-gallium-xa/Makefile =================================================================== --- graphics/mesa-gallium-xa/Makefile +++ graphics/mesa-gallium-xa/Makefile @@ -12,9 +12,8 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= used only by VMware supported architectures -LIB_DEPENDS= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} -USES= xorg +USES= llvm:lib xorg USE_XORG= xorgproto .include Index: graphics/openshadinglanguage/Makefile =================================================================== --- graphics/openshadinglanguage/Makefile +++ graphics/openshadinglanguage/Makefile @@ -16,15 +16,13 @@ BROKEN_FreeBSD_12_powerpc64= fails to compile: llvm_ops.cpp:101:10: fatal error: 'iostream' file not found BROKEN_riscv64= fails to build: /usr/include/c++/v1/__threading_support:135:3: Unsupported architecture -BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ libOpenImageIO.so:graphics/openimageio \ libpugixml.so:textproc/pugixml -RUN_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} -USES= bison cmake compiler:c++14-lang localbase ncurses qt:5 +USES= bison cmake compiler:c++14-lang llvm:min=13,build,run localbase ncurses qt:5 USE_QT= buildtools:build qmake:build @@ -53,9 +51,7 @@ .include .if ${LLVM_DEFAULT:M[678]0} -LLVM_VER= 90 .else -LLVM_VER= ${LLVM_DEFAULT} .endif post-patch: Index: graphics/seexpr/Makefile =================================================================== --- graphics/seexpr/Makefile +++ graphics/seexpr/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= bison cmake compiler:c++14-lang gl qt:5 +USES= bison cmake compiler:c++14-lang gl llvm:lib qt:5 USE_GL= gl glu USE_LDCONFIG= yes USE_QT= buildtools:build qmake:build core gui opengl widgets @@ -34,7 +34,6 @@ DEEPWATER_CMAKE_ON= -DENABLE_DEEPWATER:BOOL=TRUE LLVM_DESC= Build with LLVM ${LLVM_DEFAULT:C/.$$//} backend -LLVM_LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} LLVM_CMAKE_OFF= -DENABLE_LLVM_BACKEND:BOOL=FALSE NLS_USES= kde:5 Index: java/openjdk11/Makefile =================================================================== --- java/openjdk11/Makefile +++ java/openjdk11/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= javavm:java/javavmwrapper \ xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype -USES= compiler:features cpe gmake iconv jpeg pkgconfig xorg +USES= compiler:features cpe gmake iconv jpeg llvm:min=12 pkgconfig xorg USE_XORG= x11 xext xi xrandr xrender xt xtst CPE_VENDOR= oracle @@ -143,8 +143,6 @@ .else MAKE_ENV+= USE_CLANG=true .if ${COMPILER_VERSION} >= 130 -LLVM_VER= 12 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif Index: java/openjdk8/Makefile =================================================================== --- java/openjdk8/Makefile +++ java/openjdk8/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu -USES= compiler:features cpe gmake iconv pkgconfig +USES= compiler:features cpe gmake iconv llvm pkgconfig CPE_VENDOR= oracle @@ -209,8 +209,6 @@ # upstream fix has been applied to this version of the JDK, users still report # the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn" # occurring, when it is built with recent versions of clang. -LLVM_VER= 12 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif Index: lang/clover/Makefile =================================================================== --- lang/clover/Makefile +++ lang/clover/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ - libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libzstd.so:archivers/zstd RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl Index: lang/crystal/Makefile =================================================================== --- lang/crystal/Makefile +++ lang/crystal/Makefile @@ -16,9 +16,9 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires prebuilt bootstrap compiler -BUILD_DEPENDS= ${LOCALBASE}/bin/llvm-config${LLVM_VERSION}:devel/llvm${BOOTSTRAP_LLVM_VERSION} \ +BUILD_DEPENDS= \ git:devel/git -LIB_DEPENDS= libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \ +LIB_DEPENDS= \ libevent.so:devel/libevent \ libffi.so:devel/libffi \ libgc-threaded.so:devel/boehm-gc-threaded \ @@ -28,13 +28,12 @@ libyaml.so:textproc/libyaml RUN_DEPENDS= pkg-config:devel/pkgconf -USES= compiler gmake pkgconfig ssl +USES= compiler gmake llvm:min=14,build,lib pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= crystal-lang COMMIT_ID= 879691b2e326 -LLVM_VERSION?= 14 BOOTSTRAP_LLVM_VERSION= 14 BOOTSTRAP_VERSION= 1.5.1 BOOTSTRAP_NAME= crystal-${BOOTSTRAP_VERSION}-${ARCH}-llvm${BOOTSTRAP_LLVM_VERSION} Index: lang/ghc/Makefile =================================================================== --- lang/ghc/Makefile +++ lang/ghc/Makefile @@ -14,7 +14,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 -USES= autoreconf compiler:c11 gmake iconv:patch,translit \ +USES= autoreconf compiler:c11 gmake iconv:patch,translit llvm:min=10,build,run \ localbase:ldflags ncurses perl5 python:build shebangfix \ tar:xz @@ -65,7 +65,6 @@ LLVM_VERSION?= 12 BOOT_GHC_VERSION= 8.10.7 # LLVM version that bootstrap compiler uses -BOOT_LLVM_VERSION= 10 BASE_PACKAGES?= Cabal-3.6.3.0 array-0.5.4.0 base-4.16.4.0 binary-0.8.9.0 \ bytestring-0.11.3.1 containers-0.6.5.1 deepseq-1.4.6.1 \ @@ -119,13 +118,10 @@ # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} CONFIGURE_ARGS+= --host=${CONFIGURE_TARGET} -BUILD_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} # When GHC being compiled and GHC used for bootstrapping support different # LLVM versions, we have to pull in both. Luckily, this is relatively rare. . if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION} -BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} . endif .endif Index: lang/halide/Makefile =================================================================== --- lang/halide/Makefile +++ lang/halide/Makefile @@ -14,16 +14,13 @@ BROKEN_aarch64= fails to build: unhandled exception: Error: No arm support for this OS, see https://github.com/halide/Halide/issues/6972 BROKEN_riscv64= fails to build: /usr/include/c++/v1/__config:1141:6: No thread API -BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} # because halide expects LLVMConfig.cmake -RUN_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} -USES= cmake:testing # one test (test_apps_autoscheduler) hangs +USES= cmake:testing # llvm:min=14,build,run one test (test_apps_autoscheduler) hangs USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= Halide -LLVM_VERSION= 14 # last supported llvm # use the same compiler that devel/llvmNN installs CC= clang${LLVM_VERSION} Index: lang/ldc/Makefile =================================================================== --- lang/ldc/Makefile +++ lang/ldc/Makefile @@ -17,12 +17,10 @@ BROKEN_riscv64= fails to compile: unable to get target for 'riscv64-portbld-freebsd13.0', see -version and -mtriple. BUILD_DEPENDS= gdmd>0:devel/gdmd -RUN_DEPENDS= llvm${_LLVM_VER}>0:devel/llvm${_LLVM_VER} LIB_DEPENDS= libconfig.so:devel/libconfig \ - libgphobos.so:lang/gcc${_GCC_VER} \ - libLLVM-${_LLVM_VER}.so:devel/llvm${_LLVM_VER} + libgphobos.so:lang/gcc${_GCC_VER} -USES= ninja cmake:insource pkgconfig +USES= llvm:min=13,run,lib ninja cmake:insource pkgconfig #USE_GITHUB= yes #GH_ACCOUNT= ldc-developers @@ -35,7 +33,6 @@ LLVM_CONFIG= ${LOCALBASE}/bin/llvm-config${_LLVM_VER} _GCC_VER= 11 -_LLVM_VER= 13 .include Index: lang/lfortran/Makefile =================================================================== --- lang/lfortran/Makefile +++ lang/lfortran/Makefile @@ -18,18 +18,16 @@ dwarfdump:devel/dwarfdump \ rapidjson>0:devel/rapidjson LIB_DEPENDS= libfmt.so:devel/libfmt \ - libunwind.so:devel/libunwind \ - libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} + libunwind.so:devel/libunwind RUN_DEPENDS= dwarfdump:devel/dwarfdump USE_GITHUB= yes -USES= bison cmake:testing compiler:c++17-lang python:build shebangfix +USES= bison cmake:testing compiler:c++17-lang llvm:min=11,lib python:build shebangfix SHEBANG_FILES= *.sh BINARY_ALIAS= python=${PYTHON_CMD} CMAKE_ON= LFORTRAN_BUILD_ALL WITH_DWARFDUMP WITH_FMT WITH_JSON WITH_LINKH WITH_LLVM WITH_UNWIND -LLVM_VERSION= 11 OPTIONS_DEFINE= DOCS Index: lang/pocl/Makefile =================================================================== --- lang/pocl/Makefile +++ lang/pocl/Makefile @@ -14,16 +14,15 @@ ONLY_FOR_ARCHS_REASON= only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g} BROKEN_i386= Unable to access file /wrkdirs/usr/ports/lang/pocl/work/stage/usr/local/share/pocl/kernel-i386-portbld-freebsd13.0-avx.bc:No such file or directory -BUILD_DEPENDS= llvm${LLVM_VERSION}>=10:devel/llvm${LLVM_VERSION} \ +BUILD_DEPENDS= \ opencl>=2.2:devel/opencl LIB_DEPENDS= libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd RUN_DEPENDS= ${BUILD_DEPENDS} -USES= cmake localbase:ldflags ncurses pkgconfig +USES= cmake llvm:min=13 localbase:ldflags ncurses pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes -LLVM_VERSION= ${MESA_LLVM_VER:U13} CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \ -DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \ -DSINGLE_LLVM_LIB=ON \ Index: lang/silq/Makefile =================================================================== --- lang/silq/Makefile +++ lang/silq/Makefile @@ -14,8 +14,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= unknown status of the D language compiler (lang/ldc) on ${ARCH} -BUILD_DEPENDS= ldmd2:lang/ldc \ - llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} +BUILD_DEPENDS= ldmd2:lang/ldc USE_GITHUB= yes @@ -25,7 +24,6 @@ OPTIONS_DEFINE= EXAMPLES -LLVM_VERSION= 10 .include Index: lang/spidermonkey102/Makefile =================================================================== --- lang/spidermonkey102/Makefile +++ lang/spidermonkey102/Makefile @@ -23,7 +23,7 @@ libicudata.so:devel/icu \ libnspr4.so:devel/nspr -USES= compiler:c++17-lang gmake localbase pathfix pkgconfig \ +USES= compiler:c++17-lang gmake llvm localbase pathfix pkgconfig \ python:build readline tar:xz USE_LDCONFIG= yes SP_VER= 102 @@ -67,7 +67,6 @@ .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USE_GCC= yes .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \ ${COMPILER_VERSION} < 80 @@ -76,7 +75,6 @@ CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif pre-configure: Index: lang/spidermonkey78/Makefile =================================================================== --- lang/spidermonkey78/Makefile +++ lang/spidermonkey78/Makefile @@ -21,7 +21,7 @@ libicudata.so:devel/icu \ libnspr4.so:devel/nspr -USES= compiler:c++17-lang gmake localbase pathfix pkgconfig python:build \ +USES= compiler:c++17-lang gmake llvm localbase pathfix pkgconfig python:build \ readline tar:xz USE_LDCONFIG= yes SP_VER= 78 @@ -66,7 +66,6 @@ .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USE_GCC= yes .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \ ${COMPILER_VERSION} < 80 @@ -75,7 +74,6 @@ CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif post-patch: Index: lang/spidermonkey91/Makefile =================================================================== --- lang/spidermonkey91/Makefile +++ lang/spidermonkey91/Makefile @@ -21,7 +21,7 @@ libicudata.so:devel/icu \ libnspr4.so:devel/nspr -USES= compiler:c++17-lang gmake localbase pathfix pkgconfig \ +USES= compiler:c++17-lang gmake llvm localbase pathfix pkgconfig \ python:3.7-3.10,build readline tar:xz USE_LDCONFIG= yes SP_VER= 91 @@ -66,7 +66,6 @@ .if ${CHOSEN_COMPILER_TYPE} == gcc CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USE_GCC= yes .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \ ${COMPILER_VERSION} < 80 @@ -75,7 +74,6 @@ CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif pre-configure: Index: lang/zig-devel/Makefile =================================================================== --- lang/zig-devel/Makefile +++ lang/zig-devel/Makefile @@ -18,24 +18,21 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= not yet supported -BUILD_DEPENDS= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} CONFLICTS= zig -USES= cmake compiler:c++11-lang localbase:ldflags tar:xz +USES= cmake compiler:c++11-lang llvm:min=13 localbase:ldflags tar:xz OPTIONS_DEFINE= STATIC DOCS OPTIONS_DEFAULT= STATIC DOCS STATIC_DESC= sets ZIG_STATIC to avoid 800MiB LLVM runtime dependency -STATIC_RUN_DEPENDS_OFF= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} STATIC_CMAKE_BOOL= CMAKE_SKIP_INSTALL_RPATH ZIG_STATIC STATIC_LDFLAGS= -llzma -lm -lmd -lxml2 -lz CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -_LLVM_VER= 13 _ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig post-configure-STATIC-on: Index: lang/zig/Makefile =================================================================== --- lang/zig/Makefile +++ lang/zig/Makefile @@ -17,24 +17,21 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= not yet supported -BUILD_DEPENDS= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} icu>=71:devel/icu CONFLICTS= zig-devel -USES= cmake compiler:c++11-lang localbase:ldflags tar:xz +USES= cmake compiler:c++11-lang llvm:min=13 localbase:ldflags tar:xz OPTIONS_DEFINE= STATIC DOCS OPTIONS_DEFAULT= STATIC DOCS STATIC_DESC= sets ZIG_STATIC to avoid 800MiB LLVM runtime dependency -STATIC_RUN_DEPENDS_OFF= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER} STATIC_CMAKE_BOOL= CMAKE_SKIP_INSTALL_RPATH ZIG_STATIC STATIC_LDFLAGS= -licudata -licuuc -llzma -lm -lmd -lxml2 -lz CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -_LLVM_VER= 13 _ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig post-configure-STATIC-on: Index: math/casadi/Makefile =================================================================== --- math/casadi/Makefile +++ math/casadi/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= cmake compiler:c++11-lang pkgconfig +USES= cmake compiler:c++11-lang llvm:build,run pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes @@ -67,8 +67,6 @@ .if ${PORT_OPTIONS:MCLANG} # use clang from ports because cmake can't find base llvm for JIT -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -RUN_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} Index: math/openturns/Makefile =================================================================== --- math/openturns/Makefile +++ math/openturns/Makefile @@ -53,7 +53,7 @@ libtbb.so:devel/onetbb \ libunwind.so:devel/libunwind -USES= bison blaslapack:openblas cmake eigen:3 gnome jpeg localbase:ldflags pkgconfig sqlite xorg # compiler:c++17-lang +USES= bison blaslapack:openblas cmake eigen:3 gnome jpeg llvm:min=12,build,run localbase:ldflags pkgconfig sqlite xorg # compiler:c++17-lang USE_GITHUB= yes USE_GNOME= libxml2 USE_XORG= ice sm x11 xau xcb xdmcp xext @@ -86,11 +86,8 @@ PORTEXAMPLES= * -LLVM_VERSION= 12 # workaround for clang-13 crash: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261341 # use clang from ports because cmake can't find base llvm for JIT -BUILD_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -RUN_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} Index: math/saga/Makefile =================================================================== --- math/saga/Makefile +++ math/saga/Makefile @@ -14,7 +14,7 @@ BROKEN= requires OpenMP support that is missing on this architecture .endif -BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ +BUILD_DEPENDS= \ swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ @@ -31,7 +31,7 @@ libtiff.so:graphics/tiff RUN_DEPENDS:= swig:devel/swig -USES= cmake compiler:c++11-lib dos2unix gnome \ +USES= cmake compiler:c++11-lib dos2unix gnome llvm \ iconv:wchar_t libtool localbase pkgconfig python DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes Index: math/symengine/Makefile =================================================================== --- math/symengine/Makefile +++ math/symengine/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libboost_serialization.so:devel/boost-libs \ libgmp.so:math/gmp -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang llvm:min=13 USE_GITHUB= yes USE_LDCONFIG= yes @@ -42,7 +42,6 @@ LLVM_CMAKE_BOOL= WITH_LLVM LLVM_CMAKE_ON= -DLLVM_INCLUDE_DIRS:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/include \ -DFREEBSD_LLVM_VERSION=${LLVM_VERSION} -LLVM_BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} MPC_DESC= Build with MPC MPC_CMAKE_BOOL= WITH_MPC @@ -78,7 +77,6 @@ PIRANHA_CMAKE_ON= -DINTEGER_CLASS:STRING=piranha PIRANHA_BUILD_DEPENDS= piranha>0:math/piranha -LLVM_VERSION= 13 # ${LLVM_DEFAULT} - llvm-90 fails for some reason do-test: # one test fails: https://github.com/symengine/symengine/issues/1697 @cd ${BUILD_WRKSRC} && \ Index: misc/py-tvm/Makefile =================================================================== --- misc/py-tvm/Makefile +++ misc/py-tvm/Makefile @@ -21,7 +21,7 @@ ${PYTHON_PKGNAMEPREFIX}synr>0:devel/py-synr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} -USES= python:3.6+ +USES= llvm:min=13,run python:3.6+ USE_PYTHON= distutils noegginfo pytest # tests fail, see https://github.com/apache/tvm/issues/13132 USE_GITHUB= yes @@ -33,8 +33,6 @@ BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python -LLVM_VERSION= ${LLVM_DEFAULT} # same as in misc/tvm -RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} MAKE_ENV+= FREEBSD_LIBRARY_PATH=${LOCALBASE}/lib TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} Index: misc/thrill/Makefile =================================================================== --- misc/thrill/Makefile +++ misc/thrill/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libmpi.so:net/openmpi -USES= cmake compiler:c++17-lang fortran +USES= cmake compiler:c++17-lang fortran llvm:min=10 USE_LDCONFIG= yes USE_GITHUB= yes @@ -32,8 +32,6 @@ .include .if ${CHOSEN_COMPILER_TYPE} == clang -LLVM_VERSION= 10 # clang-11 crashes: https://bugs.llvm.org/show_bug.cgi?id=48562 -BUILD_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} Index: misc/tvm/Makefile =================================================================== --- misc/tvm/Makefile +++ misc/tvm/Makefile @@ -14,7 +14,7 @@ rang>0:devel/rang TEST_DEPENDS= googletest>0:devel/googletest -USES= cmake:testing compiler:c++11-lang localbase +USES= cmake:testing compiler:c++11-lang llvm:min=13,build,run localbase USE_GITHUB= yes USE_LDCONFIG= yes @@ -31,11 +31,8 @@ OPTIONS_DEFINE= LLVM OPTIONS_DEFAULT= LLVM -LLVM_VERSION= ${LLVM_DEFAULT} LLVM_DESC= With LLVM support for model compilation LLVM_CMAKE_ON= -DUSE_LLVM=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} -LLVM_BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -LLVM_RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} .include Index: misc/veles/Makefile =================================================================== --- misc/veles/Makefile +++ misc/veles/Makefile @@ -24,7 +24,7 @@ ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} -USES= cmake compiler python:3.6+ qt:5 shebangfix +USES= cmake compiler llvm python:3.6+ qt:5 shebangfix SHEBANG_GLOB= *.py SHEBANG_FILES= python/plugin python/proxy resources/install/postinst python/test_dis USE_GITHUB= yes @@ -42,7 +42,6 @@ .include # veles needs clang-format and clang-tidy that are only provided by the port -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .if ${CHOSEN_COMPILER_TYPE} == clang CPP= clang-cpp${LLVM_DEFAULT} Index: net-im/conduit/Makefile =================================================================== --- net-im/conduit/Makefile +++ net-im/conduit/Makefile @@ -11,9 +11,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT} -USES= cargo gmake +USES= cargo gmake llvm USE_RC_SUBR= ${PORTNAME} USERS= ${PORTNAME} GROUPS= ${USERS} Index: net-im/libsignal-node/Makefile =================================================================== --- net-im/libsignal-node/Makefile +++ net-im/libsignal-node/Makefile @@ -13,11 +13,11 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \ +BUILD_DEPENDS= \ protoc:devel/protobuf \ yarn:www/yarn-node16 -USES= cargo gmake python:3.7+,build +USES= cargo gmake llvm python:3.7+,build USE_GITHUB= yes GH_ACCOUNT= signalapp GH_TUPLE= google:boringssl:f1c75347daa2ea81a941e953f2263e0a4d970c8d:boringssl \ Index: net-im/telegram-desktop/Makefile =================================================================== --- net-im/telegram-desktop/Makefile +++ net-im/telegram-desktop/Makefile @@ -51,7 +51,7 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} -USES= cmake compiler:c++17-lang desktop-file-utils gl \ +USES= cmake compiler:c++17-lang desktop-file-utils gl llvm \ gnome localbase pkgconfig python:3.7+,build ssl xorg USE_GITHUB= nodefault @@ -102,8 +102,6 @@ .include .if ${COMPILER_VERSION} < 130 -LLVM_VER= 13 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif Index: net-mgmt/nfs-exporter/Makefile =================================================================== --- net-mgmt/nfs-exporter/Makefile +++ net-mgmt/nfs-exporter/Makefile @@ -16,9 +16,8 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -USES= cargo +USES= cargo llvm USE_RC_SUBR= nfs_exporter .include Index: science/py-tensorflow/Makefile =================================================================== --- science/py-tensorflow/Makefile +++ science/py-tensorflow/Makefile @@ -22,8 +22,7 @@ cython:lang/cython \ swig:devel/swig \ bazel:devel/bazel \ - git:devel/git \ - clang-devel:devel/llvm-devel + git:devel/git LIB_DEPENDS= libnsync.so:devel/nsync \ libgpr.so:devel/grpc \ libpng.so:graphics/png \ @@ -61,7 +60,7 @@ ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ pybind11>=2.6.2:devel/pybind11 -USES= python:3.7+ shebangfix jpeg ssl +USES= llvm python:3.7+ shebangfix jpeg ssl USE_CXXSTD= c++17 SHEBANG_GLOB= *.py USE_GITHUB= yes Index: security/afl++/Makefile =================================================================== --- security/afl++/Makefile +++ security/afl++/Makefile @@ -18,11 +18,8 @@ FLAVORS= llvm gcc FLAVOR?= ${FLAVORS:[1]} -_LLVM_VER= 13 -llvm_BUILD_DEPENDS= clang${_LLVM_VER}:devel/llvm${_LLVM_VER} -llvm_RUN_DEPENDS= clang${_LLVM_VER}:devel/llvm${_LLVM_VER} -USES= gmake shebangfix tar:tgz +USES= gmake llvm:min=13,build,run shebangfix tar:tgz .if ${FLAVOR} == gcc USE_GCC= yes .endif Index: security/sequoia/Makefile =================================================================== --- security/sequoia/Makefile +++ security/sequoia/Makefile @@ -11,12 +11,11 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS+= libcapnp.so:devel/capnproto LIB_DEPENDS+= libgmp.so:math/gmp LIB_DEPENDS+= libnettle.so:security/nettle -USES= cargo ssl +USES= cargo llvm ssl USE_LDCONFIG= yes USE_GITLAB= yes GL_ACCOUNT= sequoia-pgp Index: security/solana/Makefile =================================================================== --- security/solana/Makefile +++ security/solana/Makefile @@ -14,12 +14,12 @@ BROKEN= Fails to build with rust 1.61.0+, see https://github.com/quinn-rs/quinn/issues/1142 BROKEN_i386= Fails on 32-bit systems: https://github.com/solana-labs/solana/issues/16811 -BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION} \ +BUILD_DEPENDS= \ protoc:devel/protobuf \ gmake:devel/gmake LIB_DEPENDS= libhidapi.so:comms/hidapi -USES= cargo pkgconfig ssl +USES= cargo llvm:min=12 pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= solana-labs @@ -610,7 +610,6 @@ MAKE_ENV= ${XARCH}_UNKNOWN_FREEBSD_OPENSSL_INCLUDE_DIR=${OPENSSLINC} \ ${XARCH}_UNKNOWN_FREEBSD_OPENSSL_LIB_DIR=${OPENSSLLIB} -LLVM_VERSION= 12 BINARY_ALIAS= llvm-config=${PREFIX}/bin/llvm-config${LLVM_VERSION} Index: sysutils/gstat-rs/Makefile =================================================================== --- sysutils/gstat-rs/Makefile +++ sysutils/gstat-rs/Makefile @@ -11,9 +11,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -USES= cargo +USES= cargo llvm USE_GITHUB= yes GH_ACCOUNT= asomers SUB_FILES= pkg-message Index: textproc/castxml/Makefile =================================================================== --- textproc/castxml/Makefile +++ textproc/castxml/Makefile @@ -10,11 +10,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} -RUN_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} TEST_DEPENDS= ${LOCALBASE}/lib/libxml2.so:textproc/libxml2 -USES= cmake:testing compiler:c++11-lang +USES= cmake:testing compiler:c++11-lang llvm:min=13,build,run USE_GITHUB= yes GH_ACCOUNT= CastXML @@ -22,7 +20,6 @@ CMAKE_ARGS= -DLLVM_DIR:STRING=${LOCALBASE}/llvm${LLVM_VERSION}/lib/cmake/llvm -LLVM_VERSIONS= 15 14 13 12 11 10 90 80 70 OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= DOCS LLVM_${LLVM_DEFAULT} Index: textproc/sonic/Makefile =================================================================== --- textproc/sonic/Makefile +++ textproc/sonic/Makefile @@ -11,9 +11,8 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} -USES= cargo compiler:c++11-lang gmake +USES= cargo compiler:c++11-lang gmake llvm USE_GITHUB= yes GH_ACCOUNT= valeriansaliou USE_RC_SUBR= sonic Index: www/chromium/Makefile =================================================================== --- www/chromium/Makefile +++ www/chromium/Makefile @@ -66,7 +66,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg llvm \ localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \ tar:xz xorg @@ -218,7 +218,6 @@ .if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: www/deno/Makefile =================================================================== --- www/deno/Makefile +++ www/deno/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= gn:devel/gn \ libunwind>0:devel/libunwind -USES= cargo compiler:c++17-lang cpe gmake gnome ninja:build pkgconfig:build python:3.9+,build +USES= cargo compiler:c++17-lang cpe gmake gnome llvm ninja:build pkgconfig:build python:3.9+,build USE_GITHUB= yes GH_ACCOUNT= denoland @@ -559,7 +559,6 @@ .include .if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: www/iridium/Makefile =================================================================== --- www/iridium/Makefile +++ www/iridium/Makefile @@ -69,7 +69,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg llvm \ localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \ tar:xz xorg @@ -208,7 +208,6 @@ .if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: www/ungoogled-chromium/Makefile =================================================================== --- www/ungoogled-chromium/Makefile +++ www/ungoogled-chromium/Makefile @@ -70,7 +70,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg llvm \ localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \ tar:xz xorg @@ -233,7 +233,6 @@ .if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ Index: www/varnish-libvmod-fileserver/Makefile =================================================================== --- www/varnish-libvmod-fileserver/Makefile +++ www/varnish-libvmod-fileserver/Makefile @@ -10,11 +10,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ +BUILD_DEPENDS= \ jq>0:textproc/jq \ rst2man:textproc/py-docutils@${PY_FLAVOR} -USES= cargo compiler:c++17-lang libtool pkgconfig \ +USES= cargo compiler:c++17-lang libtool llvm pkgconfig \ python:3.5+,build varnish:7 USE_LDCONFIG= yes Index: x11-toolkits/vte3/Makefile =================================================================== --- x11-toolkits/vte3/Makefile +++ x11-toolkits/vte3/Makefile @@ -20,7 +20,7 @@ PORTSCOUT= limitw:1,even -USES= compiler:c++11-lang gettext gnome localbase meson \ +USES= compiler:c++11-lang gettext gnome llvm localbase meson \ pkgconfig python:3.6+ tar:xz vala:build USE_LDCONFIG= yes USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build @@ -44,11 +44,8 @@ CPP= ${LOCALBASE}/bin/clang-cpp${_LLVM_VERSION} CC= ${LOCALBASE}/bin/clang${_LLVM_VERSION} CXX= ${LOCALBASE}/bin/clang++${_LLVM_VERSION} -BUILD_DEPENDS+= llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} .if (${LLVM_DEFAULT} == 90 || ${LLVM_DEFAULT} == 10) -_LLVM_VERSION= 11 .else -_LLVM_VERSION= ${LLVM_DEFAULT} .endif .endif