jengelh/virtualbox
SHA256
1
0
Fork 2
forked from pool/virtualbox
Code Pull Requests Activity

- Try to build with system libs for X instead of localy built ones

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=185
This commit is contained in:
Tomáš Chvátal 2015-05-06 16:53:12 +00:00 committed by Git OBS Bridge
parent 8b7d755e0e
commit 8136611603
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 6 16:52:56 UTC 2015 - tchvatal@suse.com
- Try to build with system libs for X instead of localy built ones
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 6 15:51:43 UTC 2015 - tchvatal@suse.com Wed May 6 15:51:43 UTC 2015 - tchvatal@suse.com

42
virtualbox.spec
View File

@ -108,11 +108,25 @@ BuildRequires: udev
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: which BuildRequires: which
BuildRequires: xorg-x11 BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-server BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-sdk BuildRequires: xorg-x11-server-sdk
BuildRequires: yasm BuildRequires: yasm
BuildRequires: zlib-devel-static BuildRequires: zlib-devel-static
BuildRequires: pkgconfig(fontsproto)
BuildRequires: pkgconfig(randrproto)
BuildRequires: pkgconfig(renderproto)
BuildRequires: pkgconfig(resourceproto)
BuildRequires: pkgconfig(scrnsaverproto)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xextproto)
BuildRequires: pkgconfig(xf86driproto)
BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xineramaproto)
BuildRequires: pkgconfig(xproto)
Requires: %{name}-host-kmp = %{version} Requires: %{name}-host-kmp = %{version}
Requires(post): sysvinit(syslog) Requires(post): sysvinit(syslog)
Requires(pre): permissions Requires(pre): permissions
@ -295,13 +309,15 @@ rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
# --nofatal try to avoid build fail caused by missing makeself package # --nofatal try to avoid build fail caused by missing makeself package
# NOT an autoconf configure macro # NOT an autoconf configure macro
./configure \ ./configure \
--enable-vnc \ --ose \
--enable-vde \ --enable-vnc \
--disable-kmods \ --enable-vde \
--disable-java \ --disable-kmods \
--disable-docs \ --with-linux="/usr" \
--nofatal \ --disable-java \
--enable-webservice --disable-docs \
--nofatal \
--enable-webservice
# configure actually warns we should source env.sh (which seems like it could influence the build...) # configure actually warns we should source env.sh (which seems like it could influence the build...)
source ./env.sh source ./env.sh
@ -311,14 +327,16 @@ source ./env.sh
# VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
echo "build basic parts" echo "build basic parts"
%{_bindir}/kmk %{?_smp_mflags} \ %{_bindir}/kmk %{?_smp_mflags} \
VBOX_JAVA_HOME=%{_sysconfdir}/alternatives/java_sdk_openjdk/ \
VBOX_GCC_WERR= \ VBOX_GCC_WERR= \
KBUILD_VERBOSE=2 \ KBUILD_VERBOSE=2 \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
TOOL_YASM_AS=yasm \ TOOL_YASM_AS=yasm \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \ VBOX_WITH_VMSVGA= VBOX_WITH_VMSVGA3D= \
VBOX_PATH_PACKAGE_DOCS=%{_docdir}/virtualbox \ VBOX_BUILD_PUBLISHER=_SUSE \
all TOOL_GCC3_CFLAGS="%{optflags}" TOOL_GCC3_CXXFLAGS="%{optflags}" \
VBOX_GCC_OPT="%{optflags}"
# #
# build kernel modules for guest and host (check novel-kmp package as example) # build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp # host modules : vboxdrv,vboxnetflt,vboxnetadp