Commit 28b4da34 authored by Bryan Drewery's avatar Bryan Drewery
Browse files

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)
parent 858f9adf
......@@ -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
......
--- 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 \
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment