From 0f8afdb545bbac27832589e9b566025c5f314450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 26 Mar 2009 16:54:09 +0100 Subject: qt4: add initial version of qt4-tools-native 4.5.0 --- conf/checksums.ini | 4 ++ recipes/qt4/files/0005-fix-mkspecs.patch | 107 ------------------------------- recipes/qt4/files/g++.conf | 50 +++++++++++++++ recipes/qt4/files/linux.conf | 52 +++++++++++++++ recipes/qt4/files/qt-config.patch | 21 ++++++ recipes/qt4/qt4-embedded_4.4.3.bb | 3 +- recipes/qt4/qt4-tools-native.inc | 71 ++++++++++++++++++++ recipes/qt4/qt4-tools-native_4.4.3.bb | 71 +------------------- recipes/qt4/qt4-tools-native_4.5.0.bb | 5 ++ recipes/qt4/qt4-x11-free_4.4.3.bb | 6 +- recipes/qt4/qt4.inc | 3 +- 11 files changed, 213 insertions(+), 180 deletions(-) delete mode 100644 recipes/qt4/files/0005-fix-mkspecs.patch create mode 100644 recipes/qt4/files/g++.conf create mode 100644 recipes/qt4/files/linux.conf create mode 100644 recipes/qt4/files/qt-config.patch create mode 100644 recipes/qt4/qt4-tools-native.inc create mode 100644 recipes/qt4/qt4-tools-native_4.5.0.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index cc8da277db..d66c5679a1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -19694,6 +19694,10 @@ sha256=37274eff0b7cfb6f5a01e2535639ccd3eb4e9c6b27902d1f3bdf68a705c438d0 md5=9a639aec44a1e4c70040117183d247a3 sha256=05d06b93f95092f1318634fca24f0c2d0a1252c9f1dc2fbb427b07e8ecbb4f39 +[ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-4.5.0.tar.bz2] +md5=3bd081c940c8580ecaabc1bd898e48f0 +sha256=4f6319c6031af47ef81fef08f465e4db61c0f169f5eb9bbc8f060cc3db3ffafa + [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2] md5=05d04688c0c0230ed54e89102d689ca4 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96 diff --git a/recipes/qt4/files/0005-fix-mkspecs.patch b/recipes/qt4/files/0005-fix-mkspecs.patch deleted file mode 100644 index 46f644607e..0000000000 --- a/recipes/qt4/files/0005-fix-mkspecs.patch +++ /dev/null @@ -1,107 +0,0 @@ -Index: qt-embedded-linux-opensource-src-4.4.3/mkspecs/common/g++.conf -=================================================================== ---- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/common/g++.conf 2009-03-25 14:46:10.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/common/g++.conf 2009-03-25 14:46:14.000000000 +0100 -@@ -2,12 +2,12 @@ - # qmake configuration for common gcc - # - --QMAKE_CC = gcc --QMAKE_CFLAGS += -pipe -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ - QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} - --QMAKE_CXX = g++ --QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -+QMAKE_CXX = $(OE_QMAKE_CXX) -+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) - QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON - QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -30,9 +30,9 @@ - QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} - QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - --QMAKE_LINK = g++ --QMAKE_LINK_SHLIB = g++ --QMAKE_LFLAGS += -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) - QMAKE_LFLAGS_RELEASE += - QMAKE_LFLAGS_DEBUG += - QMAKE_LFLAGS_APP += -@@ -41,7 +41,7 @@ - QMAKE_LFLAGS_SONAME += -Wl,-soname, - QMAKE_LFLAGS_THREAD += - QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, - - QMAKE_PCH_OUTPUT_EXT = .gch - -Index: qt-embedded-linux-opensource-src-4.4.3/mkspecs/common/linux.conf -=================================================================== ---- qt-embedded-linux-opensource-src-4.4.3.orig/mkspecs/common/linux.conf 2009-03-25 14:46:10.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.4.3/mkspecs/common/linux.conf 2009-03-25 14:47:59.000000000 +0100 -@@ -7,26 +7,29 @@ - - QMAKE_INCDIR = - QMAKE_LIBDIR = --QMAKE_INCDIR_X11 = /usr/X11R6/include --QMAKE_LIBDIR_X11 = /usr/X11R6/lib --QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] --QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] --QMAKE_INCDIR_OPENGL = /usr/X11R6/include --QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = -+QMAKE_LIBDIR_X11 = -+QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -+QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -+QMAKE_INCDIR_OPENGL = -+QMAKE_LIBDIR_OPENGL = -+ - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl --QMAKE_LIBS_X11 = -lXext -lX11 -lm --QMAKE_LIBS_X11SM = -lSM -lICE -+QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -+QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) - QMAKE_LIBS_NIS = -lnsl - QMAKE_LIBS_OPENGL = -lGLU -lGL - QMAKE_LIBS_OPENGL_QT = -lGL - QMAKE_LIBS_THREAD = -lpthread - --QMAKE_MOC = $$[QT_INSTALL_BINS]/moc --QMAKE_UIC = $$[QT_INSTALL_BINS]/uic -+QMAKE_MOC = $(OE_QMAKE_MOC) -+QMAKE_UIC = $(OE_QMAKE_UIC) -+QMAKE_UIC3 = $(OE_QMAKE_UIC3) -+QMAKE_RCC = $(OE_QMAKE_RCC) - --QMAKE_AR = ar cqs -+QMAKE_AR = $(OE_QMAKE_AR) cqs - QMAKE_OBJCOPY = objcopy - QMAKE_RANLIB = - -@@ -39,7 +42,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip -+QMAKE_STRIP = $(OE_QMAKE_STRIP) - QMAKE_STRIPFLAGS_LIB += --strip-unneeded - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/recipes/qt4/files/g++.conf b/recipes/qt4/files/g++.conf new file mode 100644 index 0000000000..f1be0adc75 --- /dev/null +++ b/recipes/qt4/files/g++.conf @@ -0,0 +1,50 @@ +# +# qmake configuration for common gcc +# + +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) +QMAKE_CFLAGS_DEPS += -M +QMAKE_CFLAGS_WARN_ON += -Wall -W +QMAKE_CFLAGS_WARN_OFF += -w +QMAKE_CFLAGS_RELEASE += +QMAKE_CFLAGS_DEBUG += -g +QMAKE_CFLAGS_SHLIB += -fPIC +QMAKE_CFLAGS_STATIC_LIB += -fPIC +QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden +QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} + +QMAKE_CXX = $(OE_QMAKE_CXX) +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) +QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB +QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden +QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} +QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + +QMAKE_LINK = $(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) +QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) +QMAKE_LFLAGS_RELEASE += +QMAKE_LFLAGS_DEBUG += +QMAKE_LFLAGS_APP += +QMAKE_LFLAGS_SHLIB += -shared +QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME += -Wl,-soname, +QMAKE_LFLAGS_THREAD += +QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined +QMAKE_RPATH = -Wl,-rpath-link, + +QMAKE_PCH_OUTPUT_EXT = .gch + +# -Bsymbolic-functions (ld) support +QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions +QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, diff --git a/recipes/qt4/files/linux.conf b/recipes/qt4/files/linux.conf new file mode 100644 index 0000000000..3471c6f9f6 --- /dev/null +++ b/recipes/qt4/files/linux.conf @@ -0,0 +1,52 @@ +# +# qmake configuration for common linux +# + +QMAKE_CFLAGS_THREAD += -D_REENTRANT +QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = + + +QMAKE_LIBS = +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) +QMAKE_LIBS_NIS = -lnsl +QMAKE_LIBS_OPENGL = -lGLU -lGL +QMAKE_LIBS_OPENGL_QT = -lGL +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) +QMAKE_UIC3 = $(OE_QMAKE_UIC3) +QMAKE_RCC = $(OE_QMAKE_RCC) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_OBJCOPY = objcopy +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p +QMAKE_INSTALL_FILE = install -m 644 -p +QMAKE_INSTALL_PROGRAM = install -m 755 -p + +include(unix.conf) diff --git a/recipes/qt4/files/qt-config.patch b/recipes/qt4/files/qt-config.patch new file mode 100644 index 0000000000..3aa041aa51 --- /dev/null +++ b/recipes/qt4/files/qt-config.patch @@ -0,0 +1,21 @@ +--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 +@@ -47,6 +47,7 @@ + QT_BEGIN_NAMESPACE + extern QString qmake_libraryInfoFile(); + QT_END_NAMESPACE ++#include + #else + # include "qcoreapplication.h" + #endif +@@ -113,6 +114,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = config; ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb index d2ec8c4346..10ca9e9e8a 100644 --- a/recipes/qt4/qt4-embedded_4.4.3.bb +++ b/recipes/qt4/qt4-embedded_4.4.3.bb @@ -11,11 +11,12 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ file://0002-fix-resinit-declaration.patch;patch=1 \ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1 \ 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://0009-support-2bpp.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ " S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc new file mode 100644 index 0000000000..a581a33c9c --- /dev/null +++ b/recipes/qt4/qt4-tools-native.inc @@ -0,0 +1,71 @@ +DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" +DEPENDS = "zlib-native" +SECTION = "libs" +HOMEPAGE = "http://www.trolltech.com" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r2" + +inherit native + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ + file://qt-config.patch;patch=1 \ + file://g++.conf \ + file://linux.conf" +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" + +EXTRA_OECONF = "-prefix ${prefix} \ + -qt-libjpeg -qt-gif -system-zlib \ + -no-libjpeg -no-libpng \ + -no-accessibility \ + -no-cups \ + -no-exceptions \ + -no-nas-sound \ + -no-nis \ + -verbose -release -fast -static \ + -qt3support " + +# yank default -e, otherwise we get the following error: +# moc_qbuffer.cpp: No such file or directory +EXTRA_OEMAKE = " " + +do_configure() { + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +TOBUILD = "\ + src/tools/moc \ + src/corelib \ + src/sql \ + src/qt3support \ + src/xml \ + src/tools/uic \ + src/tools/rcc \ + src/network \ + src/gui \ + src/tools/uic3 \ + tools/linguist/lrelease \ + tools/linguist/lupdate \ +" + +do_compile() { + for i in ${TOBUILD}; do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done +} + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE}/ + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 + for i in moc uic uic3 rcc lrelease lupdate; do + install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 + done + + install -d ${STAGING_DATADIR_NATIVE}/qt4/ + cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/ + ln -sf linux-g++ ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/${BUILD_OS}-oe-g++ + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/common/ + + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/ +} + diff --git a/recipes/qt4/qt4-tools-native_4.4.3.bb b/recipes/qt4/qt4-tools-native_4.4.3.bb index 03bffcce6d..8a8d46fb8d 100644 --- a/recipes/qt4/qt4-tools-native_4.4.3.bb +++ b/recipes/qt4/qt4-tools-native_4.4.3.bb @@ -1,69 +1,2 @@ -DESCRIPTION = "Native tools for Qt/[X11|Mac|Embedded] version 4.x" -DEPENDS = "zlib-native" -SECTION = "libs" -HOMEPAGE = "http://www.trolltech.com" -PRIORITY = "optional" -LICENSE = "GPL" -PR = "r1" - -inherit native - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://0005-fix-mkspecs.patch;patch=1 \ - file://qt-config.patch;patch=1" -S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" - -EXTRA_OECONF = "-prefix ${prefix} \ - -qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static \ - -qt3support " - -# yank default -e, otherwise we get the following error: -# moc_qbuffer.cpp: No such file or directory -EXTRA_OEMAKE = " " - -do_configure() { - ln -s linux-g++ mkspecs/${BUILD_OS}-oe-g++ - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -TOBUILD = "\ - src/tools/moc \ - src/corelib \ - src/sql \ - src/qt3support \ - src/xml \ - src/tools/uic \ - src/tools/rcc \ - src/network \ - src/gui \ - src/tools/uic3 \ - tools/linguist/lrelease \ - tools/linguist/lupdate \ -" - -do_compile() { - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" - done -} - -do_stage() { - install -d ${STAGING_BINDIR_NATIVE}/ - install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 - for i in moc uic uic3 rcc lrelease lupdate; do - install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 - done - install -d ${STAGING_DATADIR_NATIVE}/qt4/ - cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/ -} - +require qt4-tools-native.inc +PR = "r2" diff --git a/recipes/qt4/qt4-tools-native_4.5.0.bb b/recipes/qt4/qt4-tools-native_4.5.0.bb new file mode 100644 index 0000000000..6e5474be31 --- /dev/null +++ b/recipes/qt4/qt4-tools-native_4.5.0.bb @@ -0,0 +1,5 @@ +require qt4-tools-native.inc +PR = "r0" + +DEFAULT_PREFERENCE = "-1" +TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-x11-free_4.4.3.bb b/recipes/qt4/qt4-x11-free_4.4.3.bb index 167629ce93..08a56a47c3 100644 --- a/recipes/qt4/qt4-x11-free_4.4.3.bb +++ b/recipes/qt4/qt4-x11-free_4.4.3.bb @@ -12,10 +12,12 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz file://0002-fix-resinit-declaration.patch;patch=1 \ file://0003-no-tools.patch;patch=1 \ file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1 \ 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://0008-qt-lib-infix.patch;patch=1 \ + file://g++.conf \ + file://linux.conf \ + " S = "${WORKDIR}/qt-x11-opensource-src-${PV}" diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 8121b9f711..8ef3e217ee 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -88,7 +88,8 @@ do_configure() { unset QMAKESPEC unset QTDIR ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ echo "[Paths]" > $QT_CONF_PATH echo "Prefix=${prefix}" >> $QT_CONF_PATH -- cgit v1.2.3