Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Oct 2017 00:15:32 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r452823 - in head/emulators/virtualbox-ose: . files
Message-ID:  <201710250015.v9P0FWo8038099@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Wed Oct 25 00:15:32 2017
New Revision: 452823
URL: https://svnweb.freebsd.org/changeset/ports/452823

Log:
  - Work around build failures with Clang 3.4.
  - Fix build without WEBSERVICE option. [1]
  
  PR:		223201 [1]

Added:
  head/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk   (contents, props changed)
  head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk   (contents, props changed)
  head/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose/Makefile

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Wed Oct 25 00:10:51 2017	(r452822)
+++ head/emulators/virtualbox-ose/Makefile	Wed Oct 25 00:15:32 2017	(r452823)
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -30,7 +31,7 @@ CPE_PRODUCT=	vm_virtualbox
 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		compiler:c++11-lang cpe iconv pkgconfig ssl tar:bzip2
+USES=		compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2
 USE_GNOME=	libidl libxml2
 
 HAS_CONFIGURE=	yes
@@ -284,7 +285,6 @@ post-patch:
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
 	    ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \

Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk	Wed Oct 25 00:15:32 2017	(r452823)
@@ -0,0 +1,10 @@
+--- src/VBox/Debugger/Makefile.kmk.orig	2017-10-18 07:09:03 UTC
++++ src/VBox/Debugger/Makefile.kmk
+@@ -109,6 +109,7 @@ VBoxDbg_SOURCES = \
+ 	VBoxDbgBase.cpp \
+ 	VBoxDbgConsole.cpp \
+ 	VBoxDbgStatsQt.cpp
++VBoxDbg_CXXFLAGS.freebsd += -std=c++11
+ VBoxDbg_LIBS = \
+ 	$(VBOX_LIB_VMM_LAZY)
+ VBoxDbg_LDFLAGS.darwin = \

Added: head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk	Wed Oct 25 00:15:32 2017	(r452823)
@@ -0,0 +1,18 @@
+--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig	2017-10-18 07:12:20 UTC
++++ src/VBox/Frontends/VirtualBox/Makefile.kmk
+@@ -895,6 +895,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI
+  VirtualBox_SOURCES += \
+ 	src/VBoxFBOverlay.cpp \
+ 	src/VBoxGLSupportInfo.cpp
++ VirtualBox_CXXFLAGS.freebsd += -std=c++11
+ endif
+ 
+ #
+@@ -1217,6 +1218,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
+   VBoxOGL2D_SOURCES = \
+ 	src/VBoxGLSupportInfo.cpp
+   VBoxOGL2D_INCS = include
++  VBoxOGL2D_CXXFLAGS.freebsd += -std=c++11
+  endif
+ endif
+ 

Added: head/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk	Wed Oct 25 00:15:32 2017	(r452823)
@@ -0,0 +1,10 @@
+--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig	2017-10-18 07:12:48 UTC
++++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk
+@@ -436,6 +436,7 @@ if (   defined(VBOX_WITH_QTGUI) \
+     $(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
+     $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
+   ifdef VBOX_WITH_VIDEOHWACCEL
++   VBoxTestOGL_CXXFLAGS.freebsd += -std=c++11
+    VBoxTestOGL_QT_MODULES   += Core Gui OpenGL Widgets
+    VBoxTestOGL_LIBS.linux   += xcb
+    VBoxTestOGL_LIBS.solaris += xcb



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