Date: Tue, 31 Mar 2020 17:46:10 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r529997 - in branches/2020Q1/emulators/virtualbox-ose: . files Message-ID: <202003311746.02VHkAWa065169@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Mar 31 17:46:10 2020 New Revision: 529997 URL: https://svnweb.freebsd.org/changeset/ports/529997 Log: MFH: r529993 - Fix runtime for gcc rpath. [1] This is a regression of something that was working in the past. Please keep the _GCC_RUNTIME handling even if removing USE_GCC as it may come back again in the future and be forgotten. - Fix build on 11.3 with ports ssl. [2] PR: 245048 [1] PR: 243315 [2] Submitted by: John Hein <jcfyecrayz at liamekaens.com> [2] Approved by: portmgr (implicit) Added: branches/2020Q1/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk - copied unchanged from r529993, head/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk Modified: branches/2020Q1/emulators/virtualbox-ose/Makefile Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/emulators/virtualbox-ose/Makefile ============================================================================== --- branches/2020Q1/emulators/virtualbox-ose/Makefile Tue Mar 31 17:44:14 2020 (r529996) +++ branches/2020Q1/emulators/virtualbox-ose/Makefile Tue Mar 31 17:46:10 2020 (r529997) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.34 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -240,7 +241,9 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk - @${ECHO_CMD} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \ + # Please keep this even if using Clang to avoid repeated regressions. + # PR 245048 + @${ECHO_CMD} "VBOX_WITH_RUNPATH = ${_GCC_RUNTIME:D${_GCC_RUNTIME}\:}${VBOX_DIR}" >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \ ${WRKSRC}/LocalConfig.kmk Copied: branches/2020Q1/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk (from r529993, head/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q1/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk Tue Mar 31 17:46:10 2020 (r529997, copy of r529993, head/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk) @@ -0,0 +1,10 @@ +--- src/VBox/RDP/client-1.8.4/Makefile.kmk.orig 2019-10-10 18:14:11 UTC ++++ src/VBox/RDP/client-1.8.4/Makefile.kmk +@@ -117,7 +117,6 @@ rdesktop-vrdp_SOURCES.solaris = \ + rdesktop-vrdp_SOURCES.freebsd = \ + rdpsnd_oss.c + rdesktop-vrdp_LIBPATH = \ +- /usr/lib \ + $(VBOX_LIBPATH_X11) + rdesktop-vrdp_LIBS = \ + X11 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003311746.02VHkAWa065169>