Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Mon Mar 1 01:50:26 CET 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-02-15 16:53:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-02-26 10:58:43.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 26 08:36:48 UTC 2010 - mseben@novell.com + +- fix gcc build issues - use gcc4.3 for build (currently virtualbox + doesn't support gcc4.5 +- added ret-in-nonvoid-fnc.diff to fix post build checks + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vbox-ret-in-nonvoid-fnc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.6smTCQ/_old 2010-03-01 01:50:17.000000000 +0100 +++ /var/tmp/diff_new_pack.6smTCQ/_new 2010-03-01 01:50:17.000000000 +0100 @@ -37,24 +37,20 @@ BuildRequires: SDL-devel kernel-syms module-init-tools BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-desktop-files BuildRequires: hal-devel pulseaudio-devel xorg-x11-devel -BuildRequires: kbuild udev +BuildRequires: gcc43-c++ kbuild udev # is needed only as owner of xorg/modules directory BuildRequires: xorg-x11-server-sdk %ifarch amd64 x86_64 ia32e em64t -BuildRequires: gcc-32bit hal-32bit BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit -BuildRequires: libgcc-32bit xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit -%if %suse_version > 1110 -BuildRequires: libstdc++44-devel-32bit -%else +BuildRequires: hal-32bit xorg-x11-libXext-devel-32bit xorg-x11-libXmu-devel-32bit BuildRequires: libstdc++43-devel-32bit -%endif +BuildRequires: gcc43-32bit libgcc-32bit # ifarch %endif # ExclusiveArch: %ix86 x86_64 Version: 3.1.4 -Release: 1 +Release: 2 Summary: VirtualBox OSE is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -85,6 +81,8 @@ #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is.displayed, when user #try to start VirtualBox and is not memeber of vboxusers group Patch19: virtualbox-ose-permissions_warning.diff +#fix post build checks, could be dropped when we switch to newer gcc +Patch20: vbox-ret-in-nonvoid-fnc.diff # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions @@ -174,6 +172,7 @@ %patch18 %endif %patch19 -p1 +%patch20 -p1 %__cp %{SOURCE7} . %build @@ -188,6 +187,8 @@ # %__sed 's/#define CONFIG_XEN 1//g' > linux/autoconf.h %__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|' LocalConfig.kmk ./configure \ + --with-g++=/usr/bin/g++-4.3 \ + --with-gcc=/usr/bin/gcc-4.3 \ --with-linux=/usr/src/linux-obj/%{_target_cpu}/default \ $EXTRA_OPTS /usr/bin/kmk \ ++++++ vbox-ret-in-nonvoid-fnc.diff ++++++ Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/nic.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/nic.c @@ -478,6 +478,7 @@ int eth_load(struct dev *dev __unused) } interruptible_sleep(2); /* lay off the server for a while */ longjmp(restart_etherboot, -1); + return 0; } Index: VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c =================================================================== --- VirtualBox-3.1.4_OSE.orig/src/VBox/Devices/PC/Etherboot-src/core/osloader.c +++ VirtualBox-3.1.4_OSE/src/VBox/Devices/PC/Etherboot-src/core/osloader.c @@ -81,6 +81,7 @@ dead_download - Restart etherboot if pro **************************************************************************/ static sector_t dead_download ( unsigned char *data __unused, unsigned int len __unused, int eof __unused) { longjmp(restart_etherboot, -2); + return 0; } #ifdef IMAGE_MULTIBOOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org