D32008.bfd.diff
jbeich (Jan Beich)
Actions

Authored By

	jbeich
	Sep 17 2021, 7:41 PM

Size

24 KB

Referenced Files

None

Subscribers

None

D32008.bfd.diff
View Options

	From 7860ce2a2e0b74927cf1bbafd19ab73483240713 Mon Sep 17 00:00:00 2001
	From: Jan Beich <jbeich@FreeBSD.org>
	Date: Fri, 17 Sep 2021 19:32:51 +0000
	Subject: [PATCH] *: drop GNU bfd workarounds after FreeBSD 11 EOL

	---
	databases/mongodb42/Makefile \| 1 -
	devel/basu/Makefile \| 5 -----
	devel/llvm10/Makefile \| 6 ------
	devel/llvm11/Makefile \| 6 ------
	devel/llvm12/Makefile \| 6 ------
	devel/llvm13/Makefile \| 6 ------
	devel/llvm70/Makefile \| 6 ------
	devel/llvm80/Makefile \| 6 ------
	devel/llvm90/Makefile \| 6 ------
	devel/spirv-llvm-translator/Makefile \| 5 -----
	...rgo-crates_libsodium-sys-stable-1.19.11_build.rs \| 10 ----------
	emulators/sameboy/Makefile \| 2 --
	games/rlvm/Makefile \| 5 -----
	games/stockfish/Makefile \| 1 -
	games/veloren/Makefile \| 5 -----
	graphics/blender-lts28/Makefile \| 4 ----
	graphics/blender/Makefile \| 4 ----
	graphics/libjxl/Makefile \| 4 ----
	graphics/mesa-devel/Makefile \| 5 -----
	graphics/openshadinglanguage/Makefile \| 5 -----
	lang/rust/Makefile \| 6 +-----
	math/py-matplotlib/Makefile \| 2 --
	multimedia/ffmpeg/Makefile \| 13 -------------
	multimedia/svt-av1/Makefile \| 4 ----
	multimedia/svt-hevc/Makefile \| 4 ----
	multimedia/svt-vp9/Makefile \| 4 ----
	multimedia/vapoursynth-vmaf/Makefile \| 5 -----
	net-p2p/openethereum/Makefile \| 2 --
	sysutils/gnome-control-center/Makefile \| 5 -----
	sysutils/tracker/Makefile \| 5 -----
	sysutils/tracker3/Makefile \| 5 -----
	www/deno/Makefile \| 1 -
	www/trafficserver/Makefile \| 6 ------
	x11-toolkits/gtk40/Makefile \| 5 -----
	x11/brisk-menu/Makefile \| 7 -------
	x11/foot/Makefile \| 4 ----
	x11/gnome-shell/Makefile \| 5 -----
	x11/kitty/Makefile \| 5 -----
	38 files changed, 1 insertion(+), 185 deletions(-)
	delete mode 100644 dns/encrypted-dns-server/files/patch-cargo-crates_libsodium-sys-stable-1.19.11_build.rs

	diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
	index fa4842d2e8fe..97e5eec44c4f 100644
	--- a/databases/mongodb42/Makefile
	+++ b/databases/mongodb42/Makefile
	@@ -57,7 +57,6 @@ MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
	USERS= mongodb
	GROUPS= mongodb

	-LTO_LDFLAGS= -fuse-ld=lld
	LTO_MAKE_ARGS= --lto=on

	SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
	diff --git a/devel/basu/Makefile b/devel/basu/Makefile
	index a0b9c021fb46..ae0b97e6441f 100644
	--- a/devel/basu/Makefile
	+++ b/devel/basu/Makefile
	@@ -21,9 +21,4 @@ USE_LDCONFIG= yes
	GH_ACCOUNT= emersion
	SHEBANG_FILES= src/basic/generate-gperfs.py

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# bus-error.c:(.text.bus_error_name_to_errno+0x9a): undefined reference to '__start_BUS_ERROR_MAP'
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
	index 680d653a8acc..c2561268e8ca 100644
	--- a/devel/llvm10/Makefile
	+++ b/devel/llvm10/Makefile
	@@ -422,12 +422,6 @@ _COMPILER_RT_LIBS+= \
	libclang_rt.ubsan_standalone_cxx-i386.a
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
	index dff6ccd91f04..609d8dc3514f 100644
	--- a/devel/llvm11/Makefile
	+++ b/devel/llvm11/Makefile
	@@ -416,12 +416,6 @@ _COMPILER_RT_LIBS+= \
	libclang_rt.ubsan_standalone_cxx-i386.a
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
	index feb1958d2447..6bf0b8cdac69 100644
	--- a/devel/llvm12/Makefile
	+++ b/devel/llvm12/Makefile
	@@ -436,12 +436,6 @@ _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt
	_COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386}
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
	index 5a69772a7cd7..6209cca683a7 100644
	--- a/devel/llvm13/Makefile
	+++ b/devel/llvm13/Makefile
	@@ -474,12 +474,6 @@ _COMPILER_RT_BLACKLISTS+= asan_ignorelist.txt
	_COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386}
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/llvm70/Makefile b/devel/llvm70/Makefile
	index a7459d8fc2e6..3bb6ee4a101e 100644
	--- a/devel/llvm70/Makefile
	+++ b/devel/llvm70/Makefile
	@@ -195,12 +195,6 @@ MAN1SRCS+= bugpoint.1 dsymutil.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
	.include <bsd.port.pre.mk>
	.include "${.CURDIR}/Makefile.COMMANDS"

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	_CRTLIBDIR= ${LLVM_PREFIX:S\|${PREFIX}/\|\|}/lib/clang/${LLVM_RELEASE}/lib/freebsd
	_CRTBLDIR= ${LLVM_PREFIX:S\|${PREFIX}/\|\|}/share
	_COMPILER_RT_BLACKLISTS= cfi_blacklist.txt
	diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
	index 5aea304d7801..7466be532595 100644
	--- a/devel/llvm80/Makefile
	+++ b/devel/llvm80/Makefile
	@@ -363,12 +363,6 @@ _COMPILER_RT_LIBS+= \
	libclang_rt.ubsan_standalone_cxx-i386.a
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
	index 5cfe0d098469..d9c00445e281 100644
	--- a/devel/llvm90/Makefile
	+++ b/devel/llvm90/Makefile
	@@ -395,12 +395,6 @@ _COMPILER_RT_LIBS+= \
	libclang_rt.ubsan_standalone_cxx-i386.a
	.endif

	-# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
	-# PR: 235282
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
	-LDFLAGS_armv6=-fuse-ld=lld
	-.endif
	-
	.if ${ARCH} == "armv6"
	BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils
	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
	diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile
	index 63259d673e60..fd8e3c598b97 100644
	--- a/devel/spirv-llvm-translator/Makefile
	+++ b/devel/spirv-llvm-translator/Makefile
	@@ -35,11 +35,6 @@ _PLIST_FILES= bin/llvm-spirv \
	libdata/pkgconfig/LLVMSPIRVLib.pc
	PLIST_FILES= ${_PLIST_FILES:S,^,${FLAVOR}/,}

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# undefined reference to `llvm::cfg::Update<llvm::BasicBlock*>::dump() const'
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	post-patch:
	@${REINPLACE_CMD} -e '/pkgconfig/s/lib/&data/' \
	${WRKSRC}/CMakeLists.txt
	diff --git a/dns/encrypted-dns-server/files/patch-cargo-crates_libsodium-sys-stable-1.19.11_build.rs b/dns/encrypted-dns-server/files/patch-cargo-crates_libsodium-sys-stable-1.19.11_build.rs
	deleted file mode 100644
	index 6ea89fb032c2..000000000000
	--- a/dns/encrypted-dns-server/files/patch-cargo-crates_libsodium-sys-stable-1.19.11_build.rs
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- cargo-crates/libsodium-sys-stable-1.19.15/build.rs.orig 2020-11-19 15:20:25 UTC
	-+++ cargo-crates/libsodium-sys-stable-1.19.15/build.rs
	-@@ -214,6 +214,7 @@ fn make_libsodium(target: &str, source_dir: &Path, ins
	- cross_compiling = true;
	- help = "";
	- } else {
	-+ cflags += " -fuse-ld=lld";
	- if target.contains("i686") {
	- compiler += " -m32 -maes";
	- cflags += " -march=i686 -fuse-ld=lld";
	diff --git a/emulators/sameboy/Makefile b/emulators/sameboy/Makefile
	index 7ae33480fa50..1305affbcdf9 100644
	--- a/emulators/sameboy/Makefile
	+++ b/emulators/sameboy/Makefile
	@@ -21,8 +21,6 @@ USE_SDL= sdl2

	MAKE_ARGS= FREEDESKTOP=true
	ALL_TARGET= sdl
	-# -flto
	-LDFLAGS+= -fuse-ld=lld

	OPTIONS_DEFINE= LIBRETRO
	OPTIONS_DEFAULT= LIBRETRO
	diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile
	index ce78b567cf06..1ba3c96f4108 100644
	--- a/games/rlvm/Makefile
	+++ b/games/rlvm/Makefile
	@@ -35,11 +35,6 @@ MAKE_ARGS= VERBOSE=1
	INSTALLS_ICONS= yes
	PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# undefined reference to symbol `inflateEnd@@ZLIB_1.2.4.0' (try adding -lz)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	OPTIONS_DEFINE= DEBUG DOCS NLS TEST
	OPTIONS_DEFAULT=MONA
	OPTIONS_MULTI= JAPANESE_FONT
	diff --git a/games/stockfish/Makefile b/games/stockfish/Makefile
	index 5be49ab6e9e9..4a840da9dc53 100644
	--- a/games/stockfish/Makefile
	+++ b/games/stockfish/Makefile
	@@ -25,7 +25,6 @@ MAKE_ARGS= ARCH=${MYARCH} \
	CXX="${CXX}" \
	PREFIX=${PREFIX}
	ALL_TARGET= build
	-LDFLAGS+= -fuse-ld=lld

	_NNUE_VER= 3475407dc199

	diff --git a/games/veloren/Makefile b/games/veloren/Makefile
	index e5ed7e5ccec8..0798e0b00fb1 100644
	--- a/games/veloren/Makefile
	+++ b/games/veloren/Makefile
	@@ -49,11 +49,6 @@ PLIST_FILES= bin/${PORTNAME}-server-cli \
	share/pixmaps/net.veloren.veloren.png
	PORTDATA= *

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# veloren_voxygenrcgu has 71718 section headers, breaking old GNU ld.bfd in base
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	CARGO_CRATES= ab_glyph-0.2.11 \
	ab_glyph_rasterizer-0.1.4 \
	addr2line-0.15.2 \
	diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile
	index 21dfe58870bf..9af9aea3b1c9 100644
	--- a/graphics/blender-lts28/Makefile
	+++ b/graphics/blender-lts28/Makefile
	@@ -42,10 +42,6 @@ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
	CFLAGS_gcc= -Wno-float-conversion
	CFLAGS_i386= -march=i586
	CXXFLAGS_i386= -march=i586
	-# Use LLVM linker where available
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif

	# prevent conflict with other blender versions
	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
	diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
	index 648f78d193ca..780e3d4fa4ae 100644
	--- a/graphics/blender/Makefile
	+++ b/graphics/blender/Makefile
	@@ -44,10 +44,6 @@ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}}
	CFLAGS_gcc= -Wno-float-conversion
	CFLAGS_i386= -march=i586
	CXXFLAGS_i386= -march=i586
	-# Use LLVM linker where available
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif

	PLIST_SUB+= VER=${DISTVERSION:R}
	OPTIONS_SUB= yes
	diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile
	index 843bf74a3b54..e43bd1c59691 100644
	--- a/graphics/libjxl/Makefile
	+++ b/graphics/libjxl/Makefile
	@@ -53,10 +53,6 @@ JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG

	LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION
	LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LTO_LDFLAGS= -fuse-ld=lld
	-.endif

	MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc
	MANPAGES_USES= python:build
	diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
	index 1f3be79143c5..1e2030cd5b7b 100644
	--- a/graphics/mesa-devel/Makefile
	+++ b/graphics/mesa-devel/Makefile
	@@ -44,11 +44,6 @@ MESON_ARGS= -Dgallium-omx=disabled \
	${NULL}
	PLIST_SUB= ARCH=${ARCH:S/amd/x86_/}

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --build-id isn't supported by old GNU ld.bfd in base
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	OPTIONS_DEFINE= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
	OPTIONS_DEFAULT= LIBUNWIND LLVM LTO VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
	OPTIONS_GROUP= DRI GALLIUM VULKAN
	diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
	index cac0723c870b..06ab523f9067 100644
	--- a/graphics/openshadinglanguage/Makefile
	+++ b/graphics/openshadinglanguage/Makefile
	@@ -28,11 +28,6 @@ USE_GITHUB= yes
	GH_ACCOUNT= imageworks
	GH_PROJECT= OpenShadingLanguage

	-# Use LLVM linker where available
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	CMAKE_ON= ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
	CMAKE_OFF= USE_BOOST_WAVE
	CMAKE_ARGS+= -DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
	diff --git a/lang/rust/Makefile b/lang/rust/Makefile
	index 1464b47cbc22..4da5d2f6f14a 100644
	--- a/lang/rust/Makefile
	+++ b/lang/rust/Makefile
	@@ -178,11 +178,7 @@ do-configure:
	@${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml
	.endif
	@${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml
	-.if ${ARCH} == armv6
	-# fails to link with base ld.bfd: rustc_codegen_llvm.e2557spx-cgu.11:(.text._ZN89_$LT$rustc_target..abi..call..CastTarget$u20$as$u20$rustc_codegen_llvm..abi..LlvmType$GT$9llvm_type17h1296210ab461fc57E+0x54): relocation truncated to fit: R_ARM_CALL against symbol `__aeabi_uldivmod' defined in .text.__aeabi_uldivmod section in /tmp/rustcdnGbao/libcompiler_builtins-ee65b414e4115a8f.rlib(compiler_builtins-ee65b414e4115a8f.compiler_builtins.ay8p39ey-cgu.13.rcgu.o)
	- @${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=lld "$$@"' > ${WRKDIR}/cc-wrapper
	- @${CHMOD} +x ${WRKDIR}/cc-wrapper
	-.elif ${ARCH} == powerpc
	+.if ${ARCH} == powerpc
	# Rust doesn't call the system compiler with the full version of the target.
	# This makes powerpc miscompile due to the secure-plt ABI change.
	# Additionally, force using ld.bfd to work around a linking problem in rustc_mir
	diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
	index 57809564b37f..35541f232899 100644
	--- a/math/py-matplotlib/Makefile
	+++ b/math/py-matplotlib/Makefile
	@@ -34,8 +34,6 @@ RUN_DEPENDS= ${PYNUMPY} \
	USES= compiler:c++11-lib gettext gnome localbase pkgconfig python:3.7+ shebangfix uniquefiles:dirs
	USE_PYTHON= distutils

	-LDFLAGS+= -fuse-ld=lld
	-
	PLIST_SUB= VER=${PORTVERSION}
	PORTEXAMPLES= *

	diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
	index 382374c09fee..0cce70e6dde8 100644
	--- a/multimedia/ffmpeg/Makefile
	+++ b/multimedia/ffmpeg/Makefile
	@@ -233,9 +233,6 @@ FDK_AAC_IMPLIES= NONFREE
	# flite
	FLITE_LIB_DEPENDS= libflite.so:audio/flite
	FLITE_CONFIGURE_ENABLE= libflite
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-FLITE_LDFLAGS= -fuse-ld=lld
	-.endif

	# fontconfig
	FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
	@@ -468,10 +465,6 @@ SRT_CONFIGURE_ENABLE= libsrt
	# svt-av1
	SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1
	SVTAV1_CONFIGURE_ON= --enable-libsvtav1
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-# https://github.com/OpenVisualCloud/SVT-AV1/issues/691
	-SVTAV1_LDFLAGS= -fuse-ld=lld
	-.endif

	# svt-hevc
	SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc
	@@ -479,9 +472,6 @@ SVTHEVC_CONFIGURE_ON= --enable-libsvthevc
	SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.0-3-g86b58f77/ffmpeg_plugin/:svthevc
	SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
	0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-SVTHEVC_LDFLAGS= -fuse-ld=lld
	-.endif
	.if make(makesum)
	.MAKEFLAGS: WITH+=SVTHEVC
	.endif
	@@ -491,9 +481,6 @@ SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9
	SVTVP9_CONFIGURE_ON= --enable-libsvtvp9
	SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-4-gabd5c59/ffmpeg_plugin/:svtvp9
	SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-SVTVP9_LDFLAGS= -fuse-ld=lld
	-.endif
	.if make(makesum)
	.MAKEFLAGS: WITH+=SVTVP9
	.endif
	diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
	index e2a3c6d2ae54..84935f4844bd 100644
	--- a/multimedia/svt-av1/Makefile
	+++ b/multimedia/svt-av1/Makefile
	@@ -35,9 +35,5 @@ OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLV

	LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION
	LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LTO_LDFLAGS= -fuse-ld=lld
	-.endif

	.include <bsd.port.mk>
	diff --git a/multimedia/svt-hevc/Makefile b/multimedia/svt-hevc/Makefile
	index 3fefa0d13ebe..113e90f12f18 100644
	--- a/multimedia/svt-hevc/Makefile
	+++ b/multimedia/svt-hevc/Makefile
	@@ -30,10 +30,6 @@ OPTIONS_DEFAULT=LTO

	LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION
	LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LTO_LDFLAGS= -fuse-ld=lld
	-.endif

	post-patch:
	# Keep using nasm and drop vendor -O/-g
	diff --git a/multimedia/svt-vp9/Makefile b/multimedia/svt-vp9/Makefile
	index 185a964b66d1..6597482f6632 100644
	--- a/multimedia/svt-vp9/Makefile
	+++ b/multimedia/svt-vp9/Makefile
	@@ -30,10 +30,6 @@ OPTIONS_DEFAULT=LTO

	LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION
	LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LTO_LDFLAGS= -fuse-ld=lld
	-.endif

	post-patch:
	# Avoid conflict with standard types
	diff --git a/multimedia/vapoursynth-vmaf/Makefile b/multimedia/vapoursynth-vmaf/Makefile
	index 9be0103afe2c..6f047a2c6fb5 100644
	--- a/multimedia/vapoursynth-vmaf/Makefile
	+++ b/multimedia/vapoursynth-vmaf/Makefile
	@@ -21,11 +21,6 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
	PORTDATA= lib${PORTNAME}.so
	PORTDOCS= *.md

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	OPTIONS_DEFINE= DOCS

	do-install-DOCS-on:
	diff --git a/net-p2p/openethereum/Makefile b/net-p2p/openethereum/Makefile
	index eb3d0c54ee8e..aee63724cf24 100644
	--- a/net-p2p/openethereum/Makefile
	+++ b/net-p2p/openethereum/Makefile
	@@ -19,8 +19,6 @@ PLIST_FILES= bin/${PORTNAME}
	CARGO_FEATURES= final
	CARGO_TEST= yes

	-RUSTFLAGS+= -C link-arg=-fuse-ld=lld
	-
	CARGO_GIT_SUBDIR= rethutil:reth-util:crates/util

	post-install:
	diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
	index e9b5ba9a08bb..37c683f97710 100644
	--- a/sysutils/gnome-control-center/Makefile
	+++ b/sysutils/gnome-control-center/Makefile
	@@ -66,11 +66,6 @@ CHEESE_MESON_TRUE= cheese
	WAYLAND_MESON_TRUE= wayland
	WAYLAND_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev

	-# This can be removed after 11.x is no longer supported
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	.include <bsd.port.pre.mk>

	# FreeBSD base gained an os-release in r354922, but that does not exist
	diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
	index ab458b0ed58e..debd5e017919 100644
	--- a/sysutils/tracker/Makefile
	+++ b/sysutils/tracker/Makefile
	@@ -42,9 +42,4 @@ BINARY_ALIAS= python3=${PYTHON_CMD}

	PLIST_SUB= LIBVER=0.304.0

	-# This can be removed after 11.x is no longer supported
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile
	index 363362ef1976..dc22e3263112 100644
	--- a/sysutils/tracker3/Makefile
	+++ b/sysutils/tracker3/Makefile
	@@ -46,9 +46,4 @@ post-patch:
	${REINPLACE_CMD} -e 's^/etc/asciidoc^${PREFIX}/etc/asciidoc^' \
	${WRKSRC}/docs/manpages/meson.build

	-# This can be removed after 11.x is no longer supported
	-.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/www/deno/Makefile b/www/deno/Makefile
	index 503b408559da..3acb652ab0e4 100644
	--- a/www/deno/Makefile
	+++ b/www/deno/Makefile
	@@ -28,7 +28,6 @@ CARGO_ENV+= CLANG_BASE_PATH=/usr \
	GN=${PREFIX}/bin/gn \
	NINJA=${NINJA_CMD} \
	V8_FROM_SOURCE=1
	-RUSTFLAGS+= -C link-arg=-fuse-ld=lld

	PLIST_FILES= bin/${PORTNAME}

	diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
	index b694c6b61611..8771f1c8ecc9 100644
	--- a/www/trafficserver/Makefile
	+++ b/www/trafficserver/Makefile
	@@ -62,12 +62,6 @@ MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached

	IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin

	-# Can be removed after 11 EoL'd
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --build-id isn't supported by old GNU ld.bfd in base
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	.include <bsd.port.pre.mk>

	.if ${PORT_OPTIONS:MIMAGEMAGICK}
	diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
	index aca09ae599b0..c1ec1c44bc06 100644
	--- a/x11-toolkits/gtk40/Makefile
	+++ b/x11-toolkits/gtk40/Makefile
	@@ -42,11 +42,6 @@ GLIB_SCHEMAS= org.gtk.Demo4.gschema.xml \
	org.gtk.gtk4.Settings.EmojiChooser.gschema.xml \
	org.gtk.gtk4.Settings.FileChooser.gschema.xml

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# undefined reference to symbol `g_module_symbol' (try adding -lgmodule-2.0)
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	OPTIONS_DEFINE= CUPS COLORD DEBUG BROADWAY FFMPEG \
	GSTREAMER VULKAN WAYLAND X11
	OPTIONS_DEFAULT=CUPS COLORD BROADWAY VULKAN WAYLAND X11
	diff --git a/x11/brisk-menu/Makefile b/x11/brisk-menu/Makefile
	index 733106839ed2..2389c95f4798 100644
	--- a/x11/brisk-menu/Makefile
	+++ b/x11/brisk-menu/Makefile
	@@ -29,11 +29,4 @@ USE_XORG= x11

	MESON_ARGS= --sysconfdir=${PREFIX}/etc

	-.if exists(/usr/bin/ld.lld)
	-LDFLAGS+= -fuse-ld=lld
	-.else
	-USE_BINUTILS= yes
	-LDFLAGS+= -B${LOCALBASE}/bin
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/x11/foot/Makefile b/x11/foot/Makefile
	index f6f6eb01cbe1..b993dbf4b4b0 100644
	--- a/x11/foot/Makefile
	+++ b/x11/foot/Makefile
	@@ -33,10 +33,6 @@ DOCS_BUILD_DEPENDS= scdoc:textproc/scdoc
	DOCS_MESON_ENABLED= docs

	LTO_MESON_TRUE= b_lto
	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --plugin isn't supported by old GNU ld.bfd in base
	-LTO_LDFLAGS= -fuse-ld=lld
	-.endif

	NOTIFY_RUN_DEPENDS= notify-send:devel/libnotify

	diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
	index ab3d18da7df8..42ef87b27dc3 100644
	--- a/x11/gnome-shell/Makefile
	+++ b/x11/gnome-shell/Makefile
	@@ -70,11 +70,6 @@ CPE_VENDOR= gnome
	GLIB_SCHEMAS= org.gnome.shell.gschema.xml \
	00_org.gnome.shell.gschema.override

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# Work around "New rpath must not be longer than the old one."
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	post-extract:
	${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces

	diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
	index ba52d774a9d7..0007682bdd45 100644
	--- a/x11/kitty/Makefile
	+++ b/x11/kitty/Makefile
	@@ -39,11 +39,6 @@ SHEBANG_GLOB= *.py
	TEST_ENV= PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
	TEST_TARGET= test

	-.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
	-# --build-id isn't supported by old GNU ld.bfd in base
	-LDFLAGS+= -fuse-ld=lld
	-.endif
	-
	BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD}

	INSTALL_WRKSRC= ${WRKSRC}/linux-package

File Metadata

Mime Type: text/x-diff
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4066933
Default Alt Text: D32008.bfd.diff (24 KB)

D32008.bfd.diffjbeich (Jan Beich)Actions

D32008.bfd.diffView Options

File Metadata

Event Timeline

D32008.bfd.diff
jbeich (Jan Beich)
Actions

D32008.bfd.diff
View Options