From nobody Thu Nov 4 00:31:25 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3ADCB183A32F; Thu, 4 Nov 2021 00:31:26 +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 4Hl4M216jGz4VvM; Thu, 4 Nov 2021 00:31:26 +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 06FFD228A9; Thu, 4 Nov 2021 00:31:26 +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 1A40VP3H063556; Thu, 4 Nov 2021 00:31:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A40VPVR063555; Thu, 4 Nov 2021 00:31:25 GMT (envelope-from git) Date: Thu, 4 Nov 2021 00:31:25 GMT Message-Id: <202111040031.1A40VPVR063555@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thomas Zander Subject: git: 0cc744a9c01c - 2021Q4 - multimedia/mplayer: Fix build on armv6, armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 0cc744a9c01c7af6757ba37e5930d31e2085422e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cc744a9c01c7af6757ba37e5930d31e2085422e commit 0cc744a9c01c7af6757ba37e5930d31e2085422e Author: Thomas Zander AuthorDate: 2021-11-04 00:27:26 +0000 Commit: Thomas Zander CommitDate: 2021-11-04 00:31:05 +0000 multimedia/mplayer: Fix build on armv6, armv7 Details: - Add dependency on binutils, as -no-integrated-as is used on both armv6 and armv7 PR: 259401 Reported by: fuz@fuz.su MFH: 2021Q4 (cherry picked from commit 276a151ebc8de073077485d09de58d8b7e554d47) --- multimedia/mplayer/Makefile.options | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 8ee48882a7b3..e331ec3cc2d8 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -46,8 +46,10 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version CFLAGS_i386+= -mstack-alignment=16 -mstackrealign .endif # ${CHOSEN_COMPILER_TYPE} == clang -CFLAGS_armv6+= -no-integrated-as -CFLAGS_armv7+= -no-integrated-as +.if ${ARCH:Marmv?} +BUILD_DEPENDS+= as:devel/binutils@native +CFLAGS+= -no-integrated-as +.endif LDFLAGS_i386+= -Wl,-z,notext