From owner-dev-commits-ports-main@freebsd.org Sat Oct 2 04:21:31 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB3D567458B; Sat, 2 Oct 2021 04:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HLv1l4tp8z4jWF; Sat, 2 Oct 2021 04:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87FED4A23; Sat, 2 Oct 2021 04:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1924LVtR020781; Sat, 2 Oct 2021 04:21:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1924LVLs020780; Sat, 2 Oct 2021 04:21:31 GMT (envelope-from git) Date: Sat, 2 Oct 2021 04:21:31 GMT Message-Id: <202110020421.1924LVLs020780@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4ffd1d5e5723 - main - audio/musicpd: drop unused MPD_CLANG_LD after 620968a43a5f MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ffd1d5e5723232c7f23214a63a4ddf02264f122 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2021 04:21:31 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ffd1d5e5723232c7f23214a63a4ddf02264f122 commit 4ffd1d5e5723232c7f23214a63a4ddf02264f122 Author: Jan Beich AuthorDate: 2021-10-02 03:47:14 +0000 Commit: Jan Beich 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 -# 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