Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Jul 2021 15:47:25 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 47be6a9af2c8 - main - multimedia/obs-studio: fix build on powerpc64*
Message-ID:  <202107061547.166FlPL9078617@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=47be6a9af2c81956fbd306cd6d44fb75dbe13636

commit 47be6a9af2c81956fbd306cd6d44fb75dbe13636
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-07-06 15:47:24 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-07-06 15:47:24 +0000

    multimedia/obs-studio: fix build on powerpc64*
    
    Invalid argument "gcc-c++17-lang", valid arguments are: c++11-lib c++11-lang c++14-lang c++17-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
    
    Also, this port builds fine with clang now.
---
 multimedia/obs-studio/Makefile | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index d3847073e48e..b1bf293f088b 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -41,7 +41,8 @@ LIB_DEPENDS_powerpc=	libluajit-5.1.so:lang/luajit
 LIB_DEPENDS_powerpc64=	libluajit-5.1.so:lang/luajit-openresty
 LIB_DEPENDS_powerpc64le=	libluajit-5.1.so:lang/luajit-openresty
 
-USES=		cmake gl gnome lua pkgconfig python:3.4+ qt:5 xorg
+USES=		cmake compiler:c++17-lang gl gnome lua pkgconfig python:3.4+ \
+		qt:5 xorg
 USE_QT=		core gui svg widgets x11extras xml buildtools_build imageformats_run qmake_build
 USE_GNOME=	glib20
 USE_GL=		gl
@@ -88,15 +89,6 @@ SNDIO_CMAKE_OFF=	-DDISABLE_SNDIO=TRUE
 VST_DESC=		Build VST submodule
 VST_CMAKE_BOOL=		BUILD_VST
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH:Mpowerpc64*}
-CFLAGS+=	-Wno-unused-label
-USES+=		compiler:gcc-c++17-lang
-.else
-USES+=		compiler:c++17-lang
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc && ${ARCH} != powerpc64



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