SPECS: mythtv.spec - build hack for -L poison in makefiles

[glen]

Author: glen                         Date: Thu Sep 21 19:48:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build hack for -L poison in makefiles

---- Files affected:
SPECS:
   mythtv.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.59 SPECS/mythtv.spec:1.60
--- SPECS/mythtv.spec:1.59	Thu Sep 14 18:38:01 2006
+++ SPECS/mythtv.spec	Thu Sep 21 21:48:00 2006
@@ -36,7 +36,7 @@
 
 #define _snap 20060905
 #define _rev 11046
-%define _rel 0.2
+%define _rel 0.3
 Summary:	A personal video recorder (PVR) application
 Summary(pl):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
@@ -295,6 +295,39 @@
 exit 1
 %endif
 
+# Assigning null to QMAKE_LIBDIR_QT will prevent makefiles contain
+# -L$(QTDIR)/%{_lib} and -Wl,-rpath,$(QTDIR)/%{_lib}. And that will
+# prevent compiler finding libs from system when they should be looked
+# from current buildtree.
+# but that made it link with -lqt which doesn't exist, instead of -lqt-mt
+# so we make QMAKE wrapper which will do sed subst after calling
+# qmake. this is the wrapper.
+cat > qmake-wrapper.sh <<'EOF'
+#!/bin/sh
+getmakefile() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-o)
+			shift
+			makefile="$1"
+			return
+			;;
+		esac
+		shift
+	done
+}
+
+qmake "$@"
+getmakefile "$@"
+if [ "$makefile" ]; then
+	%{__sed} -i -e '
+		s;-Wl,-rpath,$(QTDIR)/%{_lib};;
+		s;-L$(QTDIR)/%{_lib};;
+	' $makefile
+fi
+EOF
+chmod +x qmake-wrapper.sh
+
 %build
 %if %{with cpu_autodetect}
 # Make sure we have /proc mounted
@@ -359,7 +392,8 @@
 #	--enable-directx	enable DirectX  (Microsoft video)
 
 qmake mythtv.pro
-%{__make}
+%{__make} \
+	QMAKE=$(pwd)/qmake-wrapper.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -510,6 +544,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2006/09/21 19:48:00  glen
+- build hack for -L poison in makefiles
+
 Revision 1.59  2006/09/14 16:38:01  glen
 - move themes dir to -frontend package
 - -themes requires -frontend package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythtv.spec?r1=1.59&r2=1.60&f=u