sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Work around build failures with Clang 3.4.

Browse source 
- Fix build without WEBSERVICE option. [1]

PR:		223201 [1]
This commit is contained in:
Jung-uk Kim 2017-10-25 00:15:32 +00:00
parent 02789dc60d
commit bdb7ceb93b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=452823
4 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emulators/virtualbox-ose/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= virtualbox-ose PORTNAME= virtualbox-ose
PORTVERSION= 5.2.0 PORTVERSION= 5.2.0
PORTREVISION= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@ -30,7 +31,7 @@ CPE_PRODUCT= vm_virtualbox
WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64 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 USE_GNOME= libidl libxml2
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
@ -284,7 +285,6 @@ post-patch:
${WRKSRC}/LocalConfig.kmk ${WRKSRC}/LocalConfig.kmk
@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \ @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
${WRKSRC}/LocalConfig.kmk ${WRKSRC}/LocalConfig.kmk
@${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
.endif .endif
.if ${COMPILER_TYPE} == clang .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \

10
emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk Normal file
View file

@ -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 = \

18
emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk Normal file
View file

@ -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

10
emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk Normal file
View file

@ -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