summaryrefslogtreecommitdiff
path: root/recipes/qt4
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2009-08-01 09:16:21 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2009-08-01 13:16:09 +0200
commit7d34a1965b6a650c06e298331d45165c094f8248 (patch)
treec63ee28692870c9c74886494dd51ef868985180a /recipes/qt4
parenta969fd16fd4f70d5093408b07d87b663658df932 (diff)
qt4: Add patch to fix the visibility and bsymbolic detection
Do not use "$COMPILER" to execute the test. This fails when the passed compiler is something like "ccache gcc".
Diffstat (limited to 'recipes/qt4')
-rw-r--r--recipes/qt4/files/fix-config-tests.patch34
-rw-r--r--recipes/qt4/qt4-embedded.inc1
-rw-r--r--recipes/qt4/qt4-x11-free.inc1
3 files changed, 36 insertions, 0 deletions
diff --git a/recipes/qt4/files/fix-config-tests.patch b/recipes/qt4/files/fix-config-tests.patch
new file mode 100644
index 0000000000..1e5101d8ad
--- /dev/null
+++ b/recipes/qt4/files/fix-config-tests.patch
@@ -0,0 +1,34 @@
+Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache some-compiler-gcc" will not exist but "ccache" will.
+
+both visibility and relocs were affected.
+
+Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
+===================================================================
+--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:16.000000000 +0200
+@@ -8,7 +8,7 @@
+ int main() { return 0; }
+ EOF
+
+-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
++$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes
+ rm -f bsymbolic_functions.c libtest.so
+
+ # done
+Index: qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test
+===================================================================
+--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/fvisibility.test 2009-06-20 06:57:50.000000000 +0200
++++ qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test 2009-08-01 07:59:05.000000000 +0200
+@@ -15,9 +15,9 @@
+ EOF
+
+ if [ "$VERBOSE" = "yes" ] ; then
+- "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
++ $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes
+ else
+- "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
++ $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes
+ fi
+ rm -f fvisibility.c fvisibility.o
+ }
+
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 392ddc30bf..962233efb1 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${
file://0007-openssl-host-includes.patch;patch=1 \
file://0008-qt-lib-infix.patch;patch=1 \
file://0009-support-2bpp.patch;patch=1 \
+ file://fix-config-tests.patch;patch=1 \
file://g++.conf \
file://linux.conf \
"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index 52db1872ef..6ca20561cd 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz
file://0006-freetype-host-includes.patch;patch=1 \
file://0007-openssl-host-includes.patch;patch=1 \
file://0008-qt-lib-infix.patch;patch=1 \
+ file://fix-config-tests.patch;patch=1 \
file://g++.conf \
file://linux.conf \
"