From 118a9aeef9a276ffc072973e0a2cca7ccc773eab Mon Sep 17 00:00:00 2001 From: Bernhard Froehlich Date: Thu, 12 Dec 2013 15:29:01 +0000 Subject: - Properly add $_GCC_RUNTIME to RPATH because that variable is evaluated after bsd.port.post.mk so it's hard to test for it. This fixes various issues that look like these ... VirtualBox: Error -610 in supR3HardenedMainInitRuntime! VirtualBox: dlopen("/usr/local/lib/virtualbox/VBoxRT.so",) failed: /usr/local/lib/compat/libstdc++.so.6: version GLIBCXX_3.4.15 required by /usr/local/lib/virtualbox/VBoxRT.so not found Type Manifest File: /root/.VirtualBox/xpti.dat nsNativeComponentLoader: autoregistering begins. nsNativeComponentLoader: autoregistering succeeded VBoxManage: error: Failed to create the VirtualBox object! VBoxManage: error: Code NS_ERROR_ABORT (0x80004004) - Operation aborted (extended info not available) VBoxManage: error: Most likely, the VirtualBox COM server is not running or failed to start. PR: ports/182468 PR: ports/183085 Submitted by: bapt --- emulators/virtualbox-ose/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'emulators/virtualbox-ose') diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 722bf82a0f6a..867fa65c9efa 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ @@ -46,7 +47,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --passive-mesa USE_LDCONFIG= ${PREFIX}/lib/virtualbox -CONFLICTS= bcc-[0-9]* compat9x-* +CONFLICTS= bcc-[0-9]* CONFLICTS_INSTALL= virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]* virtualbox-ose-additions-[3,4]* virtualbox-ose-additions-devel-[3,4]* VBOXUSER?= vboxusers @@ -176,11 +177,7 @@ pre-everything:: post-patch: @${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${PREFIX}/lib/virtualbox' > ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_SHARED_LIBS = ${PREFIX}/lib/virtualbox' >> ${WRKSRC}/LocalConfig.kmk -.if defined(_GCC_RUNTIME) - @${ECHO} 'VBOX_WITH_RUNPATH = ${_GCC_RUNTIME}:${PREFIX}/lib/virtualbox' >> ${WRKSRC}/LocalConfig.kmk -.else - @${ECHO} 'VBOX_WITH_RUNPATH = ${PREFIX}/lib/virtualbox' >> ${WRKSRC}/LocalConfig.kmk -.endif + @var=${_GCC_RUNTIME}; ${ECHO} "VBOX_WITH_RUNPATH = $${var:+$${var}:}${PREFIX}/lib/virtualbox" >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk -- cgit v1.2.3