aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-10-02 03:47:14 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-10-02 04:18:02 +0000
commit4ffd1d5e5723232c7f23214a63a4ddf02264f122 (patch)
treefcb703c9150acfe9a4d2ec5734ef123e21c18254
parent20fe95fa68aa30b264a4a6c9762ef5579efa7fd3 (diff)
downloadports-4ffd1d5e5723232c7f23214a63a4ddf02264f122.tar.gz
ports-4ffd1d5e5723232c7f23214a63a4ddf02264f122.zip
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
-rw-r--r--audio/musicpd/Makefile16
1 files changed, 0 insertions, 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