Date: Sat, 2 Oct 2021 04:21:31 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4ffd1d5e5723 - main - audio/musicpd: drop unused MPD_CLANG_LD after 620968a43a5f Message-ID: <202110020421.1924LVLs020780@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ffd1d5e5723232c7f23214a63a4ddf02264f122 commit 4ffd1d5e5723232c7f23214a63a4ddf02264f122 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-10-02 03:47:14 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-10-02 04:18:02 +0000 audio/musicpd: drop unused MPD_CLANG_LD after 620968a43a5f Builds fine on armv6 at least with LLD 12.0.1. Since FreeBSD >= 12.0 armv6 is deprecated in favor of armv7, anyway. $ objdump -D $(which musicpd) | fgrep -w -e movt -e movw; echo Exit $? Exit 1 --- audio/musicpd/Makefile | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index c61b89d46c15..0f7d39a915a3 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -208,23 +208,7 @@ GROUPS= ${MPDGROUP} .include <bsd.port.pre.mk> -# Note that since the build system switch to meson, mpd fails to link with -# GNU ld 2.17 in base. Also, meson does not allow to set the linker via -# environment variables yet. -# For gcc-based platforms, gcc and ld from ports are used due to the c++14 -# requirement. For clang, we set the linker explicitly in meson.build. -.if ${ARCH} == armv6 -#lld may use movt/movw, doesn't work on armv6 -BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils -MPD_CLANG_LD= ${LOCALBASE}/bin/ld -.else -MPD_CLANG_LD= lld -.endif - post-patch: -# Insert selected linker for clang - @${REINPLACE_CMD} -e 's|%%MPD_CLANG_LD%%|${MPD_CLANG_LD}|' \ - ${WRKSRC}/meson.build # Make musicpd run as ${MPDUSER} by default @${REINPLACE_CMD} -e 's|%%MPDUSER%%|${MPDUSER}|' \ ${WRKSRC}/doc/mpdconf.example
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110020421.1924LVLs020780>