Commit 217e0cde authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: use more standard functions for qt4

parent 8ef447a4
Fix build when using a 32-bit chroot with a x86_64 kernel
Native tools would be built with -m64
--- configure.orig 2011-11-11 14:48:12.944666802 -0500
+++ configure 2011-11-11 14:48:55.108875882 -0500
--- qt4/configure.orig 2011-11-11 14:48:12.944666802 -0500
+++ qt4/configure 2011-11-11 14:48:55.108875882 -0500
@@ -168,7 +168,7 @@
#-------------------------------------------------------------------------------
......
--- mkspecs/win32-g++/qmake.conf.orig 2011-09-28 14:32:02.709958498 -0400
+++ mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
--- qt4/mkspecs/win32-g++/qmake.conf.orig 2011-09-28 14:32:02.709958498 -0400
+++ qt4/mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
@@ -14,7 +14,7 @@
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
......@@ -42,8 +42,8 @@
+QMAKE_STRIP = $(XSTRIP)
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config)
--- configure.orig 2011-11-10 18:48:29.351058392 -0500
+++ configure 2011-11-10 18:50:40.971711056 -0500
--- qt4/configure.orig 2011-11-10 18:48:29.351058392 -0500
+++ qt4/configure 2011-11-10 18:50:40.971711056 -0500
@@ -8255,11 +8255,13 @@
fi
......
--- src/plugins/imageformats/imageformats.pro.orig 2011-11-10 18:56:04.617315921 -0500
+++ src/plugins/imageformats/imageformats.pro 2011-11-10 18:56:39.269487754 -0500
--- qt4/src/plugins/imageformats/imageformats.pro.orig 2011-11-10 18:56:04.617315921 -0500
+++ qt4/src/plugins/imageformats/imageformats.pro 2011-11-10 18:56:39.269487754 -0500
@@ -1,8 +1,8 @@
TEMPLATE = subdirs
......
......@@ -21,12 +21,12 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
$(UNPACK)
cd qt-everywhere-opensource-src-$(QT4_VERSION) && \
patch -p0 < ../$(SRC)/qt4/cross.patch && \
patch -p0 < ../$(SRC)/qt4/styles.patch && \
patch -p0 < ../$(SRC)/qt4/chroot.patch && \
patch -p0 < ../$(SRC)/qt4/imageformats.patch
mv qt-everywhere-opensource-src-$(QT4_VERSION) $@ && touch $@
mv qt-everywhere-opensource-src-$(QT4_VERSION) qt-$(QT4_VERSION)
$(APPLY) $(SRC)/qt4/cross.patch
$(APPLY) $(SRC)/qt4/styles.patch
$(APPLY) $(SRC)/qt4/chroot.patch
$(APPLY) $(SRC)/qt4/imageformats.patch
$(MOVE)
XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
......
--- configure.orig 2011-11-10 17:44:02.427883340 -0500
+++ configure 2011-11-10 17:44:13.915940309 -0500
--- qt4/configure.orig 2011-11-10 17:44:02.427883340 -0500
+++ qt4/configure 2011-11-10 17:44:13.915940309 -0500
@@ -584,7 +584,7 @@
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
......
Supports Markdown
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