summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-12-26 18:56:24 +0000
committerHolger Freyther <zecke@selfish.org>2007-12-26 18:56:24 +0000
commita2b606f1c3d1069d3a7606b71040ee3131e326a6 (patch)
tree9d04bf4077d7e39c623a29a262d2a4b8494d670b
parent48713605fca4867a92cceeda9afc6c4d4c97b6b5 (diff)
packages/qmake/qmake2-native: Change the specs to find our resource compiler (rcc)
The build of qsvn failed due invoking the wrong rcc. Change the qmake specs to set QMAKE_RCC and set it to OE_QMAKE_RCC.
-rw-r--r--packages/qmake/qmake2-native/0001-fix-mkspecs.patch25
1 files changed, 19 insertions, 6 deletions
diff --git a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
index faf0ba028a..e0ebe512c8 100644
--- a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
+++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch
@@ -10,8 +10,8 @@ Subject: [PATCH] fix mkspecs
Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-26 02:58:15.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 02:58:21.000000000 +0100
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-04 18:07:53.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 19:47:02.000000000 +0100
@@ -2,12 +2,12 @@
# qmake configuration for common gcc
#
@@ -63,8 +63,8 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf
Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-26 02:58:15.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 02:58:21.000000000 +0100
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-04 18:07:53.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 19:47:02.000000000 +0100
@@ -7,26 +7,26 @@
QMAKE_INCDIR =
@@ -120,8 +120,8 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf
+include(unix.conf)
Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
===================================================================
---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-26 02:58:15.000000000 +0100
-+++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 03:00:49.000000000 +0100
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-04 18:07:53.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 19:47:02.000000000 +0100
@@ -5,7 +5,7 @@
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
@@ -131,3 +131,16 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/g++.conf)
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf 2007-12-26 19:48:20.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf 2007-12-26 19:49:50.000000000 +0100
+@@ -10,6 +10,8 @@
+ QMAKE_YACC_HEADER = $base.tab.h
+ QMAKE_YACC_SOURCE = $base.tab.c
+
++QMAKE_RCC = $$(OE_QMAKE_RCC)
++
+ QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
+
+ QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/