diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 28103bcf1c838..4d00aec7cd38c 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -184,7 +184,7 @@ CHOSEN_COMPILER_TYPE= gcc . if ${_COMPILER_ARGS:Mc++2b-lang} _LLVM_MINVER= 14 . elif ${_COMPILER_ARGS:Mc++20-lang} -_LLVM_MINVER= 11 +_LLVM_MINVER= 12 . else _LLVM_MINVER= 0 . endif diff --git a/Mk/Uses/llvm.mk b/Mk/Uses/llvm.mk index 620427320a319..608c26fca52c3 100644 --- a/Mk/Uses/llvm.mk +++ b/Mk/Uses/llvm.mk @@ -37,7 +37,7 @@ .if !defined(_INCLUDE_USES_LLVM_MK) _INCLUDE_USES_LLVM_MK= YES -_LLVM_MK_VALID_VERSIONS= 11 12 13 14 15 16 17 18 19 +_LLVM_MK_VALID_VERSIONS= 12 13 14 15 16 17 18 19 _LLVM_MK_VALID_CONSTRAINTS= min max _LLVM_MK_VALID_MODES= build run lib _LLVM_MK_VALID_EXPORTS= export noexport diff --git a/audio/csound/Makefile b/audio/csound/Makefile index eb4caaf7c139a..efb19fced3e3d 100644 --- a/audio/csound/Makefile +++ b/audio/csound/Makefile @@ -78,7 +78,7 @@ FLTK_CMAKE_OFF= -DBUILD_CSOUND_AC:BOOL=OFF \ FAUST_DESC= Build the Faust opcodes FAUST_USES= ssl -FAUST_LLVM_VERSION= 11 # should be the same as in audio/faust +FAUST_LLVM_VERSION= 15 # should be the same as in audio/faust FAUST_LIB_DEPENDS= libfaust.so:audio/faust FAUST_CMAKE_BOOL= BUILD_FAUST_OPCODES FAUST_CMAKE_ON= -DFAUST_LLVM_VERSION:STRING=${FAUST_LLVM_VERSION} diff --git a/audio/faust/Makefile b/audio/faust/Makefile index 76be472d4848f..5a4c9b3270b85 100644 --- a/audio/faust/Makefile +++ b/audio/faust/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \ libzstd.so:archivers/zstd RUN_DEPENDS= bash:shells/bash -USES= compiler:c++14-lang cmake localbase:ldflags llvm:min=15,lib ncurses python pkgconfig shebangfix # llvm: versions <11 lacked dump() function(s) that cause unresolved symbols in libfaust.so +USES= compiler:c++14-lang cmake localbase:ldflags llvm:min=15,lib ncurses python pkgconfig shebangfix USE_LDCONFIG= yes USE_GITHUB= yes diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile index 61b7ddeaa5ea2..1c60b14713372 100644 --- a/databases/postgresql16-server/Makefile +++ b/databases/postgresql16-server/Makefile @@ -106,7 +106,7 @@ LLVM_DESC= Build with support for JIT-compiling expressions LLVM_CONFIGURE_WITH= llvm LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} \ CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION} -LLVM_USES= llvm:min=11,lib +LLVM_USES= llvm:lib CONFIGURE_ARGS+= --with-icu LIB_DEPENDS+= libicudata.so:devel/icu diff --git a/databases/postgresql17-server/Makefile b/databases/postgresql17-server/Makefile index 20c681c36b09f..16ef3ecd8dcdb 100644 --- a/databases/postgresql17-server/Makefile +++ b/databases/postgresql17-server/Makefile @@ -108,7 +108,7 @@ LLVM_DESC= Build with support for JIT-compiling expressions LLVM_CONFIGURE_WITH= llvm LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} \ CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION} -LLVM_USES= llvm:min=11,lib +LLVM_USES= llvm:lib CONFIGURE_ARGS+= --with-icu LIB_DEPENDS+= libicudata.so:devel/icu diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 776ca462744ec..74abfed1ab8c9 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -58,13 +58,7 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS LIT LLD LLDB PYCLANG -OPTIONS_DEFAULT_aarch64= OPENMP -OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP -OPTIONS_DEFAULT_powerpc= GOLD -OPTIONS_DEFAULT_powerpc64= GOLD OPENMP -OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP +OPTIONS_DEFAULT= BE_NATIVE OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes diff --git a/devel/llvm11/files/patch-backport-68744ffbdd b/devel/llvm11/files/lldb/patch-backport-68744ffbdd similarity index 100% rename from devel/llvm11/files/patch-backport-68744ffbdd rename to devel/llvm11/files/lldb/patch-backport-68744ffbdd diff --git a/devel/llvm11/files/patch-swig b/devel/llvm11/files/lldb/patch-swig similarity index 100% rename from devel/llvm11/files/patch-swig rename to devel/llvm11/files/lldb/patch-swig diff --git a/devel/opencl-clang/Makefile b/devel/opencl-clang/Makefile index 961bc8ddce365..1cb738e6bbbfe 100644 --- a/devel/opencl-clang/Makefile +++ b/devel/opencl-clang/Makefile @@ -7,7 +7,6 @@ DISTVERSION_llvm15= 15.0.0 DISTVERSION_llvm14= 14.0.0 DISTVERSION_llvm13= 13.0.0 DISTVERSION_llvm12= 12.0.0 -DISTVERSION_llvm11= 11.0.0 CATEGORIES= devel PKGNAMESUFFIX= -${FLAVOR} @@ -29,7 +28,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \ libLLVMSPIRVLib.so.${FLAVOR:S/llvm//}:devel/spirv-llvm-translator@${FLAVOR} -FLAVORS= ${17 16 15 14 13 12 11:L:S/^/llvm/} +FLAVORS= ${17 16 15 14 13 12:L:S/^/llvm/} USES= cmake compiler:c++11-lib USE_GITHUB= yes @@ -51,7 +50,7 @@ _PLIST_FILES+= lib/libopencl-clang.so \ lib/libopencl-clang.so.${DISTVERSION:R:R} PLIST_FILES= ${_PLIST_FILES:S,^,${FLAVOR}/,} -.if ${FLAVOR:U} == llvm11 || ${FLAVOR:U} == llvm12 || ${FLAVOR:U} == llvm13 || ${FLAVOR:U} == llvm14 || ${FLAVOR:U} == llvm15 +.if ${FLAVOR:U} == llvm12 || ${FLAVOR:U} == llvm13 || ${FLAVOR:U} == llvm14 || ${FLAVOR:U} == llvm15 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common__clang.map .endif diff --git a/devel/opencl-clang/distinfo.llvm11 b/devel/opencl-clang/distinfo.llvm11 deleted file mode 100644 index d66c6af1cdd29..0000000000000 --- a/devel/opencl-clang/distinfo.llvm11 +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1603199408 -SHA256 (intel-opencl-clang-v11.0.0_GH0.tar.gz) = 0c0d5fb4bfc85c1c1ae4b441eea223193721ecdd3d9165bcc6f7859d90e5bf66 -SIZE (intel-opencl-clang-v11.0.0_GH0.tar.gz) = 79487 diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile index 07dd0bb8acced..4fe821336a47f 100644 --- a/devel/spirv-llvm-translator/Makefile +++ b/devel/spirv-llvm-translator/Makefile @@ -9,7 +9,6 @@ DISTVERSION_llvm15= 15.0.8 DISTVERSION_llvm14= 14.0.8 DISTVERSION_llvm13= 13.0.1 DISTVERSION_llvm12= 12.0.1 -DISTVERSION_llvm11= 11.0.1 CATEGORIES= devel PKGNAMESUFFIX= -${FLAVOR} @@ -22,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} -FLAVORS= ${19 18 17 16 15 14 13 12 11:L:S/^/llvm/} +FLAVORS= ${19 18 17 16 15 14 13 12:L:S/^/llvm/} CONFLICTS_BUILD=${FLAVOR}-lite USES= cmake compiler:c++11-lib @@ -40,7 +39,6 @@ DISTINFO_FILE= ${.CURDIR}/distinfo.${FLAVOR} CXXFLAGS+= ${${FLAVOR:S/llvm//} < 16 && ${COMPILER_TYPE} == clang:?-Wno-enum-constexpr-conversion:} CMAKE_ON= BUILD_SHARED_LIBS LLVM_BUILD_TOOLS LLVM_TOOL_SPIRV_HEADERS_BUILD CMAKE_ARGS= -DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}" -CMAKE_ARGS+= ${${FLAVOR:S/llvm//}==11:?-DBASE_LLVM_VERSION=11.0:} CMAKE_INSTALL_PREFIX= ${PREFIX}/${FLAVOR} _PLIST_FILES= bin/llvm-spirv \ include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc \ diff --git a/devel/spirv-llvm-translator/distinfo.llvm11 b/devel/spirv-llvm-translator/distinfo.llvm11 deleted file mode 100644 index 20556449a728f..0000000000000 --- a/devel/spirv-llvm-translator/distinfo.llvm11 +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1711120973 -SHA256 (KhronosGroup-SPIRV-LLVM-Translator-v11.0.1_GH0.tar.gz) = 17c07b67bc15b223d857fac5756092270466ac48683315a6cb66d7e80693f06b -SIZE (KhronosGroup-SPIRV-LLVM-Translator-v11.0.1_GH0.tar.gz) = 833310 diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index 1915b52c6b1a9..042a0c09b0d30 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -115,11 +115,7 @@ PULSEAUDIO_CONFIGURE_OFF= --without-pulse .include -.if ${LLVM_DEFAULT} == 11 -_LLVM_VERSION= 15 -.else _LLVM_VERSION= ${LLVM_DEFAULT} -.endif .if ${ARCH} == amd64 PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64"