From f816fe0ce6c9ab88095319b7245802f03076f0ec267d6829ae1668a5f638802a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 26 Apr 2011 19:46:22 +0000 Subject: [PATCH] Accepting request 68448 from home:elvigia:branches:Virtualization OBS-URL: https://build.opensuse.org/request/show/68448 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=44 --- virtualbox.changes | 6 ++++++ virtualbox.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index e440322..155fc99 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 26 19:42:44 UTC 2011 - crrodriguez@opensuse.org + +- Remove bundled libraries to ensure they are never used +- USe system boost headers,only needed for xml parser it seems. + ------------------------------------------------------------------- Fri Apr 22 16:35:55 UTC 2011 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 8c9202c..037aa02 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -31,6 +31,7 @@ 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 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk BuildRequires: LibVNCServer-devel gcc gcc-c++ kbuild pam-devel udev quilt +BuildRequires: boost-devel %if %suse_version > 1110 BuildRequires: zlib-devel-static %endif @@ -221,10 +222,9 @@ quilt push -a %__cp %{S:1} ./UserManual.pdf %build -# This package failed when testing with -Wl,-as-needed being default. -# So we disable it here, if you want to retest, just delete this comment and the line below. -#export SUSE_ASNEEDED=0 -# +#ensure we dont ever use them +rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*} + # --disable-kmods \ don't build Linux kernel modules - but use SUSE specific way see few lines under # --with-gcc=/usr/bin/gxx-4.3 do configure and set proper gcc - currently vbox support only gcc<=4.4 # --nofatal try to avoid build fail caused by missing makeself package