diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2020-04-01 01:41:04 +0800 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2020-04-01 01:41:04 +0800 |
| commit | 2e5828178907c8d1910ec116b98137e43156ff1a (patch) | |
| tree | 091251556324dfc591a30013593225c32e778385 | |
| parent | 8efdcf4816dd450c8f7e346e9a76e804686c9d94 (diff) | |
| download | freebsd-ports-gnome-2e5828178907c8d1910ec116b98137e43156ff1a.tar.gz freebsd-ports-gnome-2e5828178907c8d1910ec116b98137e43156ff1a.tar.zst freebsd-ports-gnome-2e5828178907c8d1910ec116b98137e43156ff1a.zip | |
- 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]
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 6 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index a1efa087816c..c70cc14c5db1 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -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 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 \ |