Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Apr 2020 12:13:33 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r531598 - in branches/2020Q2/multimedia/obs-qtwebkit: . files
Message-ID:  <202004131213.03DCDXUE025232@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Mon Apr 13 12:13:32 2020
New Revision: 531598
URL: https://svnweb.freebsd.org/changeset/ports/531598

Log:
  MFH: r531597
  
  multimedia/obs-qtwebkit: fix build on powerpc64
  
  cc1plus: error: unrecognized command line option "-std=c++11"
  
  Additionally, this port tries to use SSE, so it needs -DNO_WARN_X86_INTRINSICS -maltivec -mvsx on powerpc64 to use GCC's translation layer to AltiVec.
  
  Also respect CXXFLAGS to make it work.
  
  PR:		243658
  Approved by:	swills (maintainer)
  Approved by:	portmgr (fix build blanket)

Modified:
  branches/2020Q2/multimedia/obs-qtwebkit/Makefile
  branches/2020Q2/multimedia/obs-qtwebkit/files/patch-GNUmakefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/multimedia/obs-qtwebkit/Makefile
==============================================================================
--- branches/2020Q2/multimedia/obs-qtwebkit/Makefile	Mon Apr 13 12:12:19 2020	(r531597)
+++ branches/2020Q2/multimedia/obs-qtwebkit/Makefile	Mon Apr 13 12:13:32 2020	(r531598)
@@ -23,6 +23,15 @@ GH_TAGNAME=	c01aa76
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	OBS_INCLUDE=${LOCALBASE}/include OBS_LIB=${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64
+CFLAGS+=	-DNO_WARN_X86_INTRINSICS -maltivec -mvsx
+USES+=		compiler:gcc-c++11-lib
+.else
+USES+=		compiler:c++11-lang
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/GNUmakefile
 

Modified: branches/2020Q2/multimedia/obs-qtwebkit/files/patch-GNUmakefile
==============================================================================
--- branches/2020Q2/multimedia/obs-qtwebkit/files/patch-GNUmakefile	Mon Apr 13 12:12:19 2020	(r531597)
+++ branches/2020Q2/multimedia/obs-qtwebkit/files/patch-GNUmakefile	Mon Apr 13 12:13:32 2020	(r531598)
@@ -9,7 +9,7 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=2311
  endif
  
 -CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) $(shell pkg-config --cflags Qt5WebKitWidgets)
-+CXXFLAGS = -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) -I%%LOCALBASE%%/include/qt5/QtWebKitWidgets
++CXXFLAGS += -std=c++11 -Wall -g -fPIC -I$(OBS_INCLUDE) -I./src $(shell pkg-config --cflags Qt5Widgets) $(shell pkg-config --cflags Qt5WebKit) -I%%LOCALBASE%%/include/qt5/QtWebKitWidgets
  CXX      ?= c++
  RM       = /bin/rm -rf
  LDFLAGS  = -L$(OBS_LIB)



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