svn commit: r529993 - in head/emulators/virtualbox-ose: . files

[Bryan Drewery]

Author: bdrewery
Date: Tue Mar 31 17:41:04 2020
New Revision: 529993
URL: https://svnweb.freebsd.org/changeset/ports/529993

Log:
  - 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]

Added:
  head/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose/Makefile

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Tue Mar 31 17:39:42 2020	(r529992)
+++ head/emulators/virtualbox-ose/Makefile	Tue Mar 31 17:41:04 2020	(r529993)
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 PORTVERSION=	5.2.34
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -241,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

Added: 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)
+++ head/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk	Tue Mar 31 17:41:04 2020	(r529993)
@@ -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 \