summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2020-03-31 17:46:10 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2020-03-31 17:46:10 +0000
commit28b4da349ddcc9e8493e8c3d013eb2fc4107098a (patch)
tree40e9eb579a79a75bd17e32d2d6b1588dec7e57b3
parentMFH: r529134 (diff)
MFH: r5299932020Q1
- 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)
Notes
Notes: svn path=/branches/2020Q1/; revision=529997
-rw-r--r--emulators/virtualbox-ose/Makefile5
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk10
2 files changed, 14 insertions, 1 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 8ddf0f9abdbb..263e807bad26 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -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
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk
new file mode 100644
index 000000000000..9a65cb1f06d8
--- /dev/null
+++ b/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 \