Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21533 Modified Files: VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE.spec Added Files: VirtualBox-OSE-3.0.4-visibility.patch Log Message: Fix up build of vboxwebsrv somehow VirtualBox-OSE-3.0.4-visibility.patch: --- NEW FILE VirtualBox-OSE-3.0.4-visibility.patch --- Hack to fix up build of gsoap bindings on Rawhide. Still needs to be looked into. Lubomir Rintel <lkundrak(a)v3.sk&gt; diff -up VirtualBox-3.0.4_OSE/Config.kmk.visibility VirtualBox-3.0.4_OSE/Config.kmk --- VirtualBox-3.0.4_OSE/Config.kmk.visibility 2009-08-19 07:26:08.353120473 +0200 +++ VirtualBox-3.0.4_OSE/Config.kmk 2009-08-19 07:28:35.203118058 +0200 @@ -2436,7 +2436,7 @@ ifeq ($(KBUILD_TARGET),win) else # the gcc guys TEMPLATE_VBOXR3EXE_TOOL = $(VBOX_GCC_TOOL) -TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) +TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden) TEMPLATE_VBOXR3EXE_CXXFLAGS.x86 = -m32 TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64 = -m64 # L4 currently can't handle exception handling. diff -up VirtualBox-3.0.4_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility VirtualBox-3.0.4_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl --- VirtualBox-3.0.4_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility 2009-08-04 19:18:47.000000000 +0200 +++ VirtualBox-3.0.4_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl 2009-08-19 07:26:08.475118377 +0200 @@ -49,6 +49,7 @@ * Generated from: src/VBox/Main/idl/VirtualBox.xidl (VirtualBox's interface definitions in XML) * Generator: src/VBox/Main/webservice/websrv-nsmap.xsl */ +#pragma GCC visibility push(default) #include "soapH.h" SOAP_NMAC struct Namespace namespaces[] = { @@ -64,6 +65,7 @@ SOAP_NMAC struct Namespace namespaces[] <xsl:text><![CDATA[ {NULL, NULL, NULL, NULL} }; +#pragma GCC visibility pop ]]></xsl:text> </xsl:template> Index: VirtualBox-OSE-90-vboxdrv.rules =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-90-vboxdrv.rules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-OSE-90-vboxdrv.rules 3 May 2009 14:24:14 -0000 1.2 +++ VirtualBox-OSE-90-vboxdrv.rules 19 Aug 2009 05:30:12 -0000 1.3 @@ -1 +1 @@ -ACTION=="add", DEVPATH=="/class/misc/vboxdrv", OWNER="root", MODE="0600" +ACTION=="add", DEVPATH=="/class/misc/vboxdrv", OWNER="root", MODE="0666" Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- VirtualBox-OSE.spec 17 Aug 2009 05:18:49 -0000 1.23 +++ VirtualBox-OSE.spec 19 Aug 2009 05:30:12 -0000 1.24 @@ -22,7 +22,7 @@ Name: VirtualBox-OSE Version: 3.0.4 -Release: 5%{?dist} +Release: 5%{?dist}.x64 Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -46,6 +46,7 @@ Patch8: VirtualBox-OSE-3.0.4-vblank.patch Patch9: VirtualBox-OSE-3.0.4-optflags.patch Patch10: VirtualBox-OSE-2.2.0-32bit.patch +Patch11: VirtualBox-OSE-3.0.4-visibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -149,6 +150,7 @@ %patch8 -p1 -b .vblank %patch9 -p1 -b .optflags %patch10 -p1 -b .32bit +%patch11 -p1 -b .visibility # Remove prebuilt binary tools rm -rf kBuild @@ -170,6 +172,10 @@ # the installation paths, but install the tree with the default # layout under 'obj' and shuffle files around in %%install. +# FIXME: Utilize optflags. This will probably involve patching of makefiles +# Setting VBOX_GCC_OPT to optflags doesn't use the flags for large part of +# the tree, while preventing required symbols to be generated in .r0 files +echo %{optflags} kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \ @@ -230,7 +236,9 @@ obj/bin/VBoxXPCOMIPCD \ obj/bin/VBoxSysInfo.sh \ obj/bin/vboxshell.py \ - obj/bin/VBoxTestOGL + obj/bin/VBoxTestOGL \ + obj/bin/vboxwebsrv \ + obj/bin/webtest # Language files install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \ @@ -384,6 +392,8 @@ %{_libdir}/virtualbox/VBoxSVC %{_libdir}/virtualbox/VBoxTestOGL %{_libdir}/virtualbox/VBoxXPCOMIPCD +%{_libdir}/virtualbox/vboxwebsrv +%{_libdir}/virtualbox/webtest %{priv_mode} %{_libdir}/virtualbox/VBoxHeadless %{priv_mode} %{_libdir}/virtualbox/VBoxSDL %{priv_mode} %{_libdir}/virtualbox/VBoxNetDHCP