From f471b8322dbae66f2166c7920815b141b24c2858 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Sun, 25 Nov 2012 14:42:17 +0200
Subject: [PATCH] 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,@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@_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}
-- 
2.44.0