Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Nov 2021 00:31:25 GMT
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 0cc744a9c01c - 2021Q4 - multimedia/mplayer: Fix build on armv6, armv7
Message-ID:  <202111040031.1A40VPVR063555@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by riggs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0cc744a9c01c7af6757ba37e5930d31e2085422e

commit 0cc744a9c01c7af6757ba37e5930d31e2085422e
Author:     Thomas Zander <riggs@FreeBSD.org>
AuthorDate: 2021-11-04 00:27:26 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111040031.1A40VPVR063555>