git: 265c4c3dbff4 - main - multimedia/libdv: fix build on !x86

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Thu, 13 Apr 2023 00:52:13 UTC

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=265c4c3dbff47f6e795d8e8acd3ce04dabf95599

commit 265c4c3dbff47f6e795d8e8acd3ce04dabf95599
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-04-13 00:51:22 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-04-13 00:51:22 +0000

    multimedia/libdv: fix build on !x86
    
    Disable asm on everything but amd64 / i386:
    libdv/meson.build:62:2: ERROR: Problem encountered: Assembly optimizations were requested, but are not available with this architecture/compiler.
---
 multimedia/libdv/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index c6de6c1f06be..674d028631bb 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -26,4 +26,10 @@ LDFLAGS_i386=	-Wl,-znotext
 
 MESON_ARGS=	-Dtools=enabled
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+MESON_ARGS+=	-Dasm=disabled
+.endif
+
 .include <bsd.port.mk>