Description: Fix FTBFS with ld --as-needed on illumos Index: virtualbox/Config.kmk =================================================================== --- virtualbox.orig/Config.kmk 2014-06-06 20:04:42.067625033 +0400 +++ virtualbox/Config.kmk 2014-06-06 21:58:49.212001761 +0400 @@ -4228,7 +4228,7 @@ else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN TEMPLATE_VBOXMAINEXE_DEFS += _REENTRANT -TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) rt thread +TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) nvpair else $(warning Warning: VBOX Build: Target $(KBUILD_TARGET) is not officially supported!) TEMPLATE_VBOXMAINEXE_LIBS = @@ -4890,7 +4890,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),solaris) TEMPLATE_VBOXBLDPROG_TOOL = GXX3PLAIN -TEMPLATE_VBOXBLDPROG_LIBS = rt +TEMPLATE_VBOXBLDPROG_LIBS = else $(warning Warning: VBOX Build: Target $(KBUILD_HOST) is not officially supported!) endif @@ -5016,7 +5016,7 @@ else if1of ($(KBUILD_TARGET), darwin freebsd netbsd openbsd) TEMPLATE_VBOXGUESTR3EXE_LIBS = $(TEMPLATE_VBOXR3EXE_LIBS) iconv else ifeq ($(KBUILD_TARGET), solaris) - TEMPLATE_VBOXGUESTR3EXE_LIBS = $(TEMPLATE_VBOXR3EXE_LIBS) nsl + TEMPLATE_VBOXGUESTR3EXE_LIBS = $(TEMPLATE_VBOXR3EXE_LIBS) nsl contract endif # Index: virtualbox/src/VBox/Main/Makefile.kmk =================================================================== --- virtualbox.orig/src/VBox/Main/Makefile.kmk 2014-06-06 21:58:34.565712653 +0400 +++ virtualbox/src/VBox/Main/Makefile.kmk 2014-06-06 22:10:16.401149655 +0400 @@ -316,6 +316,8 @@ $(LIB_DDU) VBoxSVC_SDKS = VBOX_LIBPNG VBOX_ZLIB VBoxSVC_LIBS.solaris = \ + kstat \ + nvpair \ adm \ nsl \ devinfo \ @@ -469,7 +471,6 @@ VBoxSVC_SOURCES.solaris += src-server/solaris/PerformanceSolaris.cpp VBoxSVC_SOURCES.win += src-server/win/PerformanceWin.cpp VBoxSVC_LDFLAGS.darwin += -lproc - VBoxSVC_LDFLAGS.solaris += -lkstat -lnvpair VBoxSVC_LDFLAGS.win += psapi.lib powrprof.lib endif