Commit a16e34d7 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

contrib: qt4: use proper cross compile

parent e8d7f910
...@@ -22,7 +22,6 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz: ...@@ -22,7 +22,6 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4 qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
$(UNPACK) $(UNPACK)
patch -p0 < $(SRC)/qt4/tools.diff
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifdef HAVE_WIN64 ifdef HAVE_WIN64
patch -p0 < $(SRC)/qt4/cross-win64.diff patch -p0 < $(SRC)/qt4/cross-win64.diff
...@@ -33,8 +32,7 @@ endif ...@@ -33,8 +32,7 @@ endif
mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@ mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
.qt4: qt4 .qt4: qt4
for i in qmake moc uic rcc; do ln -sf `which $$i` $</bin/; done # FIXME : we probably need the exact same version of those tools on the host cd $< && ./configure -xplatform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
cd $< && ./configure -platform win32-g++ -static -release -fast -no-exceptions -no-stl -no-sql-sqlite -no-qt3support -no-gif -no-libmng -qt-libjpeg -no-libtiff -no-qdbus -no-openssl -no-webkit -sse -no-script -no-multimedia -no-phonon -opensource -no-scripttools -no-opengl -no-script -no-scripttools -no-declarative -no-declarative-debug -opensource -no-s60 -host-little-endian -confirm-license
cd $< && make sub-src cd $< && make sub-src
cd $</src/plugins/imageformats/jpeg && make # FIXME cd $</src/plugins/imageformats/jpeg && make # FIXME
# INSTALLING LIBRARIES # INSTALLING LIBRARIES
......
--- qt-everywhere-opensource-src-4.7.4/configure.orig 2011-09-28 14:31:35.039958884 -0400
+++ qt-everywhere-opensource-src-4.7.4/configure 2011-09-28 14:31:48.649958702 -0400
@@ -4568,7 +4568,7 @@
}
# build qmake
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+if [ '!' -f "$outpath/bin/qmake" ]; then
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
--- qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro.orig 2011-09-28 14:33:24.119957315 -0400
+++ qt-everywhere-opensource-src-4.7.4/src/tools/tools.pro 2011-09-28 14:33:56.619956845 -0400
@@ -1,11 +1,6 @@
TEMPLATE = subdirs
-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc
-!contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic
-!cross_compile {
- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
- win32:!wince*: SRC_SUBDIRS += src_tools_idc
-}
+TOOLS_SUBDIRS = src_tools_bootstrap
# Set subdir and respective target name
src_tools_bootstrap.subdir = $$QT_SOURCE_TREE/src/tools/bootstrap
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment