[packages/VirtualBox] build with pld flags
glen
glen at pld-linux.org
Sun Nov 25 13:42:51 CET 2012
commit f471b8322dbae66f2166c7920815b141b24c2858
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Nov 25 14:42:17 2012 +0200
build with pld flags
VirtualBox.spec | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6c38c7a..906016f 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,7 +1,5 @@
-#
# TODO
# - java bindings
-# - Find how to compile with PLD CFLAGS/CXXFLAGS/LDFLAGS.
# - Package SDK.
# - Package utils (and write initscripts ?) for Guest OS.
# - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
@@ -514,7 +512,11 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
-sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
+# Respect LDFLAGS
+%{__sed} -i -e "s at _LDFLAGS\.%{vbox_arch}*.*=@& %{rpmldflags}@g" \
+ -i Config.kmk src/libs/xpcom18a4/Config.kmk
+
+%{__sed} 's#@LIBDIR@#%{_libdir}#' < %{SOURCE9} > VirtualBox-wrapper.sh
install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
cd PLD-MODULE-BUILD
@@ -545,9 +547,13 @@ XSERVER_VERSION=$(rpm -q --queryformat '%{VERSION}\n' xorg-xserver-server-devel
. ./env.sh && \
kmk -j1 \
%{?with_verbose:KBUILD_VERBOSE=3} \
- USER=$(id -un) \
+ USER=%(id -un) \
VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
- XSERVER_VERSION="$XSERVER_VERSION"
+ XSERVER_VERSION="$XSERVER_VERSION" \
+ TOOL_GCC3_CFLAGS="%{rpmcflags}" \
+ TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
+ VBOX_GCC_OPT="%{rpmcxxflags}" \
+ %{nil}
%endif
%if %{with kernel}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/f471b8322dbae66f2166c7920815b141b24c2858
More information about the pld-cvs-commit
mailing list