From owner-svn-ports-head@freebsd.org Fri Jan 22 12:46:57 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 852A9A8C2D5; Fri, 22 Jan 2016 12:46:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A5871374; Fri, 22 Jan 2016 12:46:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MCkuAj062651; Fri, 22 Jan 2016 12:46:56 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MCkunE062650; Fri, 22 Jan 2016 12:46:56 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201601221246.u0MCkunE062650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 22 Jan 2016 12:46:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406926 - head/emulators/virtualbox-ose X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2016 12:46:57 -0000 Author: lwhsu Date: Fri Jan 22 12:46:56 2016 New Revision: 406926 URL: https://svnweb.freebsd.org/changeset/ports/406926 Log: Add "Enable R0 logging" option and set BUILD_TYPE=debug while DEBUG option set PR: 206470 Submitted by: lwhsu Approved by: decke Modified: head/emulators/virtualbox-ose/Makefile Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Fri Jan 22 12:01:32 2016 (r406925) +++ head/emulators/virtualbox-ose/Makefile Fri Jan 22 12:46:56 2016 (r406926) @@ -62,7 +62,7 @@ VBOX_UTILS= VBoxExtPackHelperApp VBoxNet VBOX_GUEST_VER= ${PORTVERSION} OPTIONS_DEFINE= DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \ - QT4 UDPTUNNEL VDE VNC VPX WEBSERVICE X11 + QT4 R0LOGGING UDPTUNNEL VDE VNC VPX WEBSERVICE X11 OPTIONS_DEFAULT= DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11 OPTIONS_SUB= yes @@ -70,6 +70,7 @@ DEBUG_DESC= Debug symbols, additional lo GUESTADDITIONS_DESC= Build with Guest Additions MANUAL_DESC= Build with user manual QT4_DESC= Build with QT4 Frontend +R0LOGGING_DESC= Enable R0 logging UDPTUNNEL_DESC= Build with UDP tunnel support VDE_DESC= Build with VDE support VNC_DESC= Build with VNC support @@ -125,10 +126,15 @@ BROKEN= QT4 frontend requires X11 suppo .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug +KMK_FLAGS+= BUILD_TYPE=debug .else KMK_BUILDTYPE= release .endif +.if ${PORT_OPTIONS:MR0LOGGING} && empty(PORT_OPTIONS:MDEBUG) +BROKEN= R0 logging requires debug build +.endif + .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${VBOX_GUEST_VER}.iso GADISTFILES= ${GUESTADDITIONS}:guestadditions @@ -192,7 +198,7 @@ PLIST_SUB+= ARCH="${KMK_ARCH}" KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys -KMK_FLAGS= -j${MAKE_JOBS_NUMBER} +KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .include @@ -241,6 +247,9 @@ post-patch: @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk .endif +.if ${PORT_OPTIONS:MR0LOGGING} + @${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk +.endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk