Page MenuHomeFreeBSD
Files F102757665

D37747.id114689.diff
No OneTemporary
Actions

D37747.id114689.diff
View Options

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
# <none>: 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
+# <none> 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,13 @@
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} \
- bash:shells/bash
+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:build,run localbase pkgconfig shebangfix
USE_GITHUB= yes
GH_ACCOUNT= nickg
@@ -33,14 +31,13 @@
LDFLAGS+= -lexecinfo
-CONFIGURE_ARGS= --with-llvm=${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
+CONFIGURE_ARGS= --with-llvm=${LLVM_CONFIG}
TEST_TARGET= check # several tests fail, see https://github.com/nickg/nvc/issues/530
TEST_WRKSRC= ${WRKSRC}/.build
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
@@ -83,9 +83,8 @@
FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2"
GANDIVA_DESC= Gandiva libraries
-GANDIVA_USES= ssl
+GANDIVA_USES= llvm:12 ssl # explicitly requires llvm-12
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:min=13 localbase perl5 python shebangfix
USE_PERL5= build
CPE_VENDOR= yandex
@@ -227,16 +227,10 @@
TEST_CMAKE_BOOL= ENABLE_TESTS
-.include <bsd.port.options.mk>
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
-.if ${OSVERSION} < 1400000
-CC= clang13
-CXX= clang++13
-BUILD_DEPENDS+= clang++13:devel/llvm13
-.else
-CC= clang
-CXX= clang++
-.endif
+.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD
SUB_LIST+= LEGACY_LIMITS="@comment " \
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,9 +11,7 @@
LICENSE= MIT
-RUN_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
- lld${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
- pkgconf:devel/pkgconf
+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 <semaphore>)
-USES= cmake compiler:c++20-lang
+USES= cmake compiler:c++20-lang llvm:min=13
USE_GITHUB= yes
GH_ACCOUNT= David-Haim
@@ -22,10 +22,9 @@
.include <bsd.port.options.mk>
.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
+CPP= ${LLVM_CPP}
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
.endif
do-test: # same as recommended in https://github.com/David-Haim/concurrencpp#building-installing-and-testing
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: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 \
@@ -22,12 +20,12 @@
BROKEN_FreeBSD_12_powerpc64= fails to configure: cannot compile and link test program with selected LLVM
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \
- CC=${LOCALBASE}/bin/clang${LLVM_VER} \
- CXX=${LOCALBASE}/bin/clang++${LLVM_VER} \
- CPP=${LOCALBASE}/bin/clang-cpp${LLVM_VER}
+CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} \
+ CC=${LLVM_CC} \
+ CXX=${LLVM_CXX} \
+ CPP=${LLVM_CPP}
-USES= autoreconf compiler gmake libtool perl5
+USES= autoreconf compiler gmake libtool llvm:min=8,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
-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
+USES= cmake llvm:min=13,build,run python:3.6+ shebangfix
+CMAKE_ARGS+= -DLLVM_DIR:PATH=${LLVM_PREFIX}/lib/cmake/llvm
+CMAKE_ARGS+= -DClang_DIR:PATH=${LLVM_PREFIX}/lib/cmake/clang
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:13 \
jpeg localbase:ldflags ninja pkgconfig python:build,test \
shebangfix tar:xz xorg
CPE_VENDOR= electronjs
@@ -186,14 +186,12 @@
.include <bsd.port.pre.mk>
.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} \
- ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
- nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
- ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
+BINARY_ALIAS+= cpp=${LLVM_CPP} \
+ cc=${LLVM_CC} \
+ c++=${LLVM_CXX} \
+ ar=${LLVM_AR} \
+ nm=${LLVM_NM} \
+ ld=${LLVM_LD}
.else
BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm
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:8,build,run perl5 tar:xz \
shebangfix
_USES_PYTHON?= python:build
USES+= ${_USES_PYTHON}
@@ -26,11 +24,11 @@
SHEBANG_FILES= tools/f18/flang.sh
-CC= ${LOCALBASE}/llvm80/bin/clang
-CXX= ${LOCALBASE}/llvm80/bin/clang++
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
-CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm80/lib/cmake/llvm \
- -DBUILD_WITH_CLANG=${LOCALBASE}/llvm80
+CMAKE_ARGS+= -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm \
+ -DBUILD_WITH_CLANG=${LLVM_PREFIX}
MAKE_JOBS_UNSAFE= yes
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,27 +10,24 @@
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: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
CMAKE_ON= BUILD_SHARED_LIBS
-CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE:PATH=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \
+CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE:PATH=${LLVM_CONFIG} \
-DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
PLIST_SUB= PORTVERSION=${PORTVERSION}
Index: devel/include-what-you-use/Makefile
===================================================================
--- devel/include-what-you-use/Makefile
+++ devel/include-what-you-use/Makefile
@@ -10,17 +10,14 @@
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:14,build,run ncurses python:3.8,run shebangfix
USE_GITHUB= yes
SHEBANG_FILES= fix_includes.py \
iwyu_tool.py
-CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm \
- -DClang_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/clang
+CMAKE_ARGS+= -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm \
+ -DClang_DIR=${LLVM_PREFIX}/lib/cmake/clang
.include <bsd.port.mk>
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
@@ -25,7 +24,7 @@
SHEBANG_FILES= *.py
-CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} # see https://github.com/ispc/ispc/issues/2318
+CONFIGURE_ENV= PATH=${LLVM_PREFIX}/bin:${PATH} # see https://github.com/ispc/ispc/issues/2318
CMAKE_OFF= ISPC_NO_DUMPS DISPCRT_BUILD_GPU ISPC_INCLUDE_TESTS ISPCRT_BUILD_TESTS ISPC_INCLUDE_EXAMPLES
CMAKE_ARGS= -DFREEBSD_LLVM_VERSION=${LLVM_VERSION} # see https://github.com/ispc/ispc/issues/2318
@@ -38,7 +37,7 @@
ARM_CMAKE_BOOL= ARM_ENABLED
XE_DESC= Enable Intel Xe support
-XE_BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_VERSION}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION}
+XE_BUILD_DEPENDS= ${LLVM_PREFIX}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION}
XE_LIB_DEPENDS= libze_loader.so:devel/level-zero \
libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@llvm${LLVM_VERSION}
XE_CMAKE_BOOL= XE_ENABLED
@@ -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,14 +13,14 @@
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:15 python:3.6+,build tar:xz
USE_LDCONFIG= yes
BINARY_ALIAS= python=${PYTHON_CMD}
-CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config15
+CMAKE_ARGS+= -DLLVM_CONFIG=${LLVM_CONFIG}
.include <bsd.port.mk>
Index: devel/oclgrind/Makefile
===================================================================
--- devel/oclgrind/Makefile
+++ devel/oclgrind/Makefile
@@ -12,24 +12,21 @@
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
USE_LDCONFIG= yes
-CC= clang${LLVM_VER}
-CXX= clang++${LLVM_VER}
-CPP= clang-cpp${LLVM_VER}
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
+CPP= ${LLVM_CPP}
CFLAGS_riscv64= -mno-relax
-CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm/
+CMAKE_ARGS+= -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm/
.include <bsd.port.mk>
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 <bsd.port.mk>
Index: devel/py-llvmcpy/Makefile
===================================================================
--- devel/py-llvmcpy/Makefile
+++ devel/py-llvmcpy/Makefile
@@ -12,13 +12,12 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
- ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${PY_FLAVOR} \
+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
+# see the compatibility table https://github.com/numba/llvmlite#compatibility
+USES= compiler:c++11-lib llvm: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/youcompleteme/Makefile
===================================================================
--- devel/youcompleteme/Makefile
+++ devel/youcompleteme/Makefile
@@ -42,8 +42,8 @@
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}
+C_USES= llvm:lib
+C_CMAKE_ON= -DPATH_TO_LLVM_ROOT=${LLVM_PREFIX}
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/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/wine-proton/Makefile
===================================================================
--- emulators/wine-proton/Makefile
+++ emulators/wine-proton/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wine-proton
-DISTVERSION= 7.0-5
+DISTVERSION= 7.0-4
CATEGORIES= emulators
MAINTAINER= iwtcex@gmail.com
@@ -10,7 +10,6 @@
LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
-IGNORE_FreeBSD_12=requires F_ADD_SEALS
ONLY_FOR_ARCHS= amd64 i386
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
@@ -27,11 +26,11 @@
USE_GITHUB= yes
GH_ACCOUNT= ValveSoftware
GH_PROJECT= wine
-GH_TAGNAME= 492470267af486cb24ad0deaa028168eb94618a4
+GH_TAGNAME= fb6e6af8928a29660e8cf797d43e028ea5bf8d23
USE_GL= gl
USE_GNOME= glib20
-USE_GSTREAMER= gl mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda
+USE_GSTREAMER= good
USE_SDL= sdl2
USE_XORG= x11 xext xcomposite xcursor xi xinerama xrandr xrender
Index: graphics/blender/Makefile
===================================================================
--- graphics/blender/Makefile
+++ graphics/blender/Makefile
@@ -1,6 +1,6 @@
PORTNAME= blender
-DISTVERSION= 3.4.1
-PORTREVISION= 0
+DISTVERSION= 3.2.2
+PORTREVISION= 4
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
@@ -18,7 +18,6 @@
BUILD_DEPENDS= ${PYNUMPY}
LIB_DEPENDS= libpng.so:graphics/png \
- libepoxy.so:graphics/libepoxy \
libfreetype.so:print/freetype2 \
libboost_regex.so:devel/boost-libs \
libzstd.so:archivers/zstd
@@ -27,8 +26,8 @@
# 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 \
- python:3.10 shebangfix tar:xz xorg
+USES= cmake compiler:c++17-lang cpe gl jpeg python:3.10 shebangfix \
+ tar:xz xorg
USE_XORG= x11 xext xfixes xmu xrender
USE_GL= gl glu glew
@@ -80,11 +79,11 @@
CYCLESOSL_IMPLIES= CYCLES
CYCLESOSL_CMAKE_BOOL= WITH_CYCLES_OSL WITH_LLVM
CYCLESOSL_CMAKE_ON= -DLLVM_STATIC:BOOL=OFF \
- -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
+ -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
-CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+CYCLESOSL_BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
CYCLESOSL_LIB_DEPENDS= liboslcomp.so:graphics/openshadinglanguage
-CYCLESOSL_RUN_DEPENDS= llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+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}
@@ -147,18 +146,12 @@
OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
# openmp usually works on amd64
OPENMP_CMAKE_BOOL= WITH_OPENMP
-OPENPGL_ONLY_FOR_ARCHS= amd64 armv6 armv7
-OPENPGL_ONLY_FOR_ARCHS_REASON= requires supported SIMD ISA
-OPENPGL_CMAKE_BOOL= WITH_CYCLES_PATH_GUIDING
-OPENPGL_LIB_DEPENDS= libopenpgl.so:graphics/openpgl
OPENSUBDIV_CMAKE_BOOL= WITH_OPENSUBDIV
OPENSUBDIV_LIB_DEPENDS= libosdCPU.so:graphics/opensubdiv
OPENVDB_IMPLIES= TBB
OPENVDB_CMAKE_BOOL= WITH_OPENVDB WITH_OPENVDB_BLOSC
OPENVDB_LIB_DEPENDS= libblosc.so:archivers/c-blosc \
libopenvdb.so:misc/openvdb
-POTRACE_CMAKE_BOOL= WITH_POTRACE
-POTRACE_LIB_DEPENDS= libpotrace.so:graphics/libpotrace
PUGIXML_CMAKE_BOOL= WITH_PUGIXML
PUGIXML_LIB_DEPENDS= libpugixml.so:textproc/pugixml
PULSEAUDIO_CMAKE_BOOL= WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
@@ -177,11 +170,6 @@
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TRACE_CMAKE_BOOL= WITH_POTRACE
TRACE_LIB_DEPENDS= libpotrace.so:graphics/libpotrace
-WAYLAND_CMAKE_BOOL= WITH_GHOST_WAYLAND
-WAYLAND_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor \
- libxkbcommon.so:x11/libxkbcommon
-WEBP_CMAKE_BOOL= WITH_IMAGE_WEBP
-WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
XINPUT_CMAKE_BOOL= WITH_X11_XINPUT
XINPUT_USE= XORG=xi
XF86VMODE_CMAKE_BOOL= WITH_X11_XF86VMODE
@@ -193,13 +181,15 @@
.include <bsd.port.options.mk>
-.if ${ARCH} != amd64 && ${ARCH} != i386
-CMAKE_ARGS+= -DWITH_CPU_SSE:BOOL=OFF
+.if ${ARCH:Mpowerpc*} || ${ARCH:Mriscv64*}
+CMAKE_ARGS+= -DWITH_CPU_SIMD:BOOL=OFF
.endif
-post-patch:
- ${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VERSION}|g' \
- ${WRKSRC}/intern/cycles/kernel/osl/CMakeLists.txt
+.if ${LLVM_DEFAULT:M[678]0}
+LLVM_VER= 90
+.else
+LLVM_VER= ${LLVM_DEFAULT}
+.endif
post-build:
@(cd ${WRKSRC}/doc/manpage && \
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-devel/Makefile
===================================================================
--- graphics/mesa-devel/Makefile
+++ graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mesa
-DISTVERSION= 22.3-branchpoint-2363
-DISTVERSIONSUFFIX= -gc9a4c0f22ae
+DISTVERSION= 22.3-branchpoint-2340
+DISTVERSIONSUFFIX= -g2b2824b9eaa
CATEGORIES= graphics
PKGNAMESUFFIX= -devel
Index: graphics/mesa-dri/Makefile.common
===================================================================
--- graphics/mesa-dri/Makefile.common
+++ graphics/mesa-dri/Makefile.common
@@ -83,9 +83,9 @@
BINARY_ALIAS+= python3=${PYTHON_VERSION}
-LLVM_DEFAULT= 15
-BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
+_llvm_ver= 15
+USES+= llvm:${_llvm_ver}
+CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
MESON_ARGS+= -Dllvm=enabled
Index: lang/crystal/Makefile
===================================================================
--- lang/crystal/Makefile
+++ lang/crystal/Makefile
@@ -16,10 +16,8 @@
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} \
- git:devel/git
-LIB_DEPENDS= libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \
- libevent.so:devel/libevent \
+BUILD_DEPENDS= git:devel/git
+LIB_DEPENDS= libevent.so:devel/libevent \
libffi.so:devel/libffi \
libgc-threaded.so:devel/boehm-gc-threaded \
libgmp.so:math/gmp \
@@ -28,18 +26,17 @@
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}
-MAKE_ARGS= LLVM_CONFIG="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
+MAKE_ARGS= LLVM_CONFIG="${LLVM_CONFIG}" \
CRYSTAL_CONFIG_PATH="lib:${PREFIX}/lib/${PORTNAME}" \
CRYSTAL_CONFIG_BUILD_COMMIT="${COMMIT_ID}" \
CRYSTAL_CACHE_DIR="${WRKDIR}/cache" \
Index: lang/halide/Makefile
===================================================================
--- lang/halide/Makefile
+++ lang/halide/Makefile
@@ -14,23 +14,20 @@
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}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
+CPP= ${LLVM_CPP}
-CMAKE_ARGS= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VERSION}/lib/cmake/llvm
+CMAKE_ARGS= -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm
CMAKE_ON= LLVM_USE_SHARED_LLVM_LIBRARY HALIDE_SHARED_LIBRARY \
Halide_SHARED_LLVM
CMAKE_OFF= WITH_PYTHON_BINDINGS WITH_APPS WITH_TUTORIALS WITH_DOCS WITH_TESTS # APPS are demos
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:13,run,lib ninja cmake:insource pkgconfig
#USE_GITHUB= yes
#GH_ACCOUNT= ldc-developers
@@ -30,12 +28,11 @@
USE_LDCONFIG= yes
-CC= ${LOCALBASE}/bin/clang${_LLVM_VER}
-CXX= ${LOCALBASE}/bin/clang++${_LLVM_VER}
-LLVM_CONFIG= ${LOCALBASE}/bin/llvm-config${_LLVM_VER}
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
+LLVM_CONFIG= ${LLVM_CONFIG}
_GCC_VER= 11
-_LLVM_VER= 13
.include <bsd.port.pre.mk>
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: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/silq/Makefile
===================================================================
--- lang/silq/Makefile
+++ lang/silq/Makefile
@@ -14,9 +14,9 @@
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
+USES= llvm:10
USE_GITHUB= yes
GH_TUPLE= eth-sri:silq:afaf865 \
@@ -25,7 +25,6 @@
OPTIONS_DEFINE= EXAMPLES
-LLVM_VERSION= 10
.include <bsd.port.options.mk>
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/saga/Makefile
===================================================================
--- math/saga/Makefile
+++ math/saga/Makefile
@@ -14,8 +14,7 @@
BROKEN= requires OpenMP support that is missing on this architecture
.endif
-BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
- swig:devel/swig
+BUILD_DEPENDS= swig:devel/swig
LIB_DEPENDS= libcurl.so:ftp/curl \
libfftw3.so:math/fftw3 \
libgdal.so:graphics/gdal \
@@ -31,7 +30,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: 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:run python:3.6+
USE_PYTHON= distutils noegginfo pytest # tests fail, see https://github.com/apache/tvm/issues/13132
USE_GITHUB= yes
@@ -33,9 +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: 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,10 @@
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
- protoc:devel/protobuf \
+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
@@ -1,11 +1,11 @@
PORTNAME= telegram-desktop
-DISTVERSION= 4.5.0
+DISTVERSION= 4.4.1
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= osa@FreeBSD.org
COMMENT= Telegram Desktop messaging app
WWW= https://desktop.telegram.org/
@@ -28,6 +28,7 @@
libavformat.so:multimedia/ffmpeg \
libdbus-1.so:devel/dbus \
libdispatch.so:devel/libdispatch \
+ libenchant-2.so:textproc/enchant2 \
libhunspell-1.7.so:textproc/hunspell \
libjpeg.so:graphics/jpeg-turbo \
liblz4.so:archivers/liblz4 \
@@ -72,7 +73,9 @@
USE_GNOME= glib20 glibmm26
USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst
-CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH}
+CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
+ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
+ -Ddisable_autoupdate=1
CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS
@@ -86,14 +89,19 @@
# Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
# It dynamically loads PulseAudio, and if this fails, it loads ALSA.
# If both of them are not installed, then voice calls do not work, but other functionalities still work.
+OPTIONS_DEFINE= WEBKIT
OPTIONS_DEFAULT= ALSA
OPTIONS_MULTI= AUDIO
OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO
AUDIO_DESC= Audio backend for voice calls
+WEBKIT_DESC= WebKit-gtk integration for payments
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+WEBKIT_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WEBKITGTK
+WEBKIT_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3
+WEBKIT_USE= GNOME=cairo,gtk30
# Telegram asks each custom build to have its own API ID and hash.
TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d
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 <bsd.port.options.mk>
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,11 @@
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} \
- protoc:devel/protobuf \
+BUILD_DEPENDS= protoc:devel/protobuf \
gmake:devel/gmake
LIB_DEPENDS= libhidapi.so:comms/hidapi
-USES= cargo pkgconfig ssl
+USES= cargo llvm:12 pkgconfig ssl
USE_GITHUB= yes
GH_ACCOUNT= solana-labs
@@ -610,7 +609,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/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/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:min=11 localbase meson \
pkgconfig python:3.6+ tar:xz vala:build
USE_LDCONFIG= yes
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
@@ -41,15 +41,9 @@
.include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109
-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
+CPP= ${LLVM_CPP}
+CC= ${LLVM_CC}
+CXX= ${LLVM_CXX}
.endif
.include <bsd.port.post.mk>

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 6:14 PM (24 m, 59 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14683048
Default Alt Text
D37747.id114689.diff (49 KB)

Event Timeline