cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r529993

Browse Source 
- 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)
This commit is contained in:
Bryan Drewery 2020-03-31 17:46:10 +00:00
parent 858f9adf3a
commit 28b4da349d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=529997
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emulators/virtualbox-ose/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= virtualbox-ose PORTNAME= virtualbox-ose
PORTVERSION= 5.2.34 PORTVERSION= 5.2.34
PORTREVISION= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/ MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@ -240,7 +241,9 @@ post-patch:
${WRKSRC}/LocalConfig.kmk ${WRKSRC}/LocalConfig.kmk
@${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \ @${ECHO_CMD} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
${WRKSRC}/LocalConfig.kmk ${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 ${WRKSRC}/LocalConfig.kmk
@${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \ @${ECHO_CMD} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \
${WRKSRC}/LocalConfig.kmk ${WRKSRC}/LocalConfig.kmk

10
emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk Normal file
View File

@ -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 \