[mingw-qt: 24/65] more build workarounds

epienbro epienbro at fedoraproject.org
Tue Mar 6 21:28:46 UTC 2012


commit bc404f034af3686fa702c2a8ecd00665910babef
Author: sailer <sailer at fedoraproject.org>
Date:   Tue Nov 24 10:26:48 2009 +0000

    more build workarounds

 mingw32-qt.spec |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index c09c289..2b15544 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -18,7 +18,11 @@
 #   from the native Fedora package.  The reason is so that we can
 #   set the default include and library paths correctly.
 
-%global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools src/testlib src/activeqt src/multimedia src/plugins
+%global subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools src/testlib src/multimedia
+# does not compile:
+# src/plugins
+%global relsubdirs src/activeqt
+#global dbgsubdirs 
 
 Name:           mingw32-qt
 Version:        4.6.0
@@ -105,7 +109,7 @@ cp %{SOURCE3} %{SOURCE4} mkspecs/%{platform}
 
 
 %build
-for d in %{subdirs}; do
+for d in %{?subdirs} %{?relsubdirs} %{?dbgsubdirs}; do
   # Precompiled headers from a previous iteration of this loop
   # cause the compiler deep confusion, so make sure any are removed
   # _and_ the PCH directories are fresh and empty.
@@ -138,7 +142,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for d in %{subdirs}; do
+for d in %{?subdirs} %{?relsubdirs}; do
   # As above ... WTF is Qt doing confusing make and make install??
   rm -rf tmp/obj/release_shared/qt_pch.h.gch
   mkdir -p tmp/obj/release_shared/qt_pch.h.gch
@@ -152,7 +156,9 @@ for d in %{subdirs}; do
   fi
   make %{?_smp_mflags} INSTALL_ROOT=$RPM_BUILD_ROOT install
   popd
+done
 
+for d in %{?subdirs} %{?dbgsubdirs}; do
   # As above ...
   rm -rf tmp/obj/debug_shared/qt_pch.h.gch
   mkdir -p tmp/obj/debug_shared/qt_pch.h.gch
@@ -168,6 +174,14 @@ for d in %{subdirs}; do
   popd
 done
 
+# Special treatment for activeqt debug
+pushd src/activeqt
+make debug
+popd
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
+install lib/libQAxContainerd.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+install lib/libQAxServerd.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+
 # Qt ignores our carefully configured directories and just
 # puts stuff in default directories.  Move them to the proper
 # places ...
@@ -218,6 +232,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/QtXmld4.dll
 %{_mingw32_bindir}/QtXmlPatterns4.dll
 %{_mingw32_bindir}/QtXmlPatternsd4.dll
+%{_mingw32_bindir}/QtMultimedia4.dll
+%{_mingw32_bindir}/QtMultimediad4.dll
+%{_mingw32_bindir}/QtTest4.dll
+%{_mingw32_bindir}/QtTestd4.dll
 %{_mingw32_libdir}/libQt3Support4.a
 %{_mingw32_libdir}/libQt3Supportd4.a
 %{_mingw32_libdir}/libQtCore4.a
@@ -244,6 +262,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libQtXmld4.a
 %{_mingw32_libdir}/libQtXmlPatterns4.a
 %{_mingw32_libdir}/libQtXmlPatternsd4.a
+%{_mingw32_libdir}/libQAxContainer.a
+%{_mingw32_libdir}/libQAxContainerd.a
+%{_mingw32_libdir}/libQAxServer.a
+%{_mingw32_libdir}/libQAxServerd.a
+%{_mingw32_libdir}/libQtMultimedia4.a
+%{_mingw32_libdir}/libQtMultimediad4.a
+%{_mingw32_libdir}/libQtTest4.a
+%{_mingw32_libdir}/libQtTestd4.a
 %{_mingw32_includedir}/Qt/
 %{_mingw32_includedir}/Qt3Support/
 %{_mingw32_includedir}/QtCore/
@@ -256,6 +282,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_includedir}/QtSvg/
 %{_mingw32_includedir}/QtXml/
 %{_mingw32_includedir}/QtXmlPatterns/
+%{_mingw32_includedir}/ActiveQt/
+%{_mingw32_includedir}/QtMultimedia/
+%{_mingw32_includedir}/QtTest/
 
 
 %changelog


More information about the scm-commits mailing list