Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slim down devel/llvm11 #337

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion Mk/Uses/compiler.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Mk/Uses/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion audio/csound/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion audio/faust/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion databases/postgresql16-server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion databases/postgresql17-server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions devel/llvm11/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
5 changes: 2 additions & 3 deletions devel/opencl-clang/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -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
Expand All @@ -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

Expand Down
3 changes: 0 additions & 3 deletions devel/opencl-clang/distinfo.llvm11

This file was deleted.

4 changes: 1 addition & 3 deletions devel/spirv-llvm-translator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -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
Expand All @@ -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 \
Expand Down
3 changes: 0 additions & 3 deletions devel/spirv-llvm-translator/distinfo.llvm11

This file was deleted.

4 changes: 0 additions & 4 deletions emulators/wine-proton/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,7 @@ PULSEAUDIO_CONFIGURE_OFF= --without-pulse

.include <bsd.port.pre.mk>

.if ${LLVM_DEFAULT} == 11
_LLVM_VERSION= 15
.else
_LLVM_VERSION= ${LLVM_DEFAULT}
.endif

.if ${ARCH} == amd64
PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64"
Expand Down