summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-12-25 00:51:57 +0000
committerHolger Freyther <zecke@selfish.org>2007-12-25 00:51:57 +0000
commite1311f8ec38ad3db4488887fe993987c66b8f79c (patch)
treea92b7408cb0eaaef67cfa3899398480a93b5b903 /packages
parent7c023dc83c4fa8193fdd8513f5ce9b8c0ae68d96 (diff)
packages/qt4/qt_configuration.inc: Make use of the new QT_CONF_PATH, correct the configure line
Generate a qt.conf in do_configure with the paths we pass to the ./configure script.
Diffstat (limited to 'packages')
-rw-r--r--packages/qt4/qt_configuration.inc24
1 files changed, 20 insertions, 4 deletions
diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc
index 921b110618..9388fb3933 100644
--- a/packages/qt4/qt_configuration.inc
+++ b/packages/qt4/qt_configuration.inc
@@ -17,17 +17,33 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
AR="${TARGET_PREFIX}ar cqs" \
MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+export QT_CONF_PATH="${WORKDIR}/qt.conf"
+
do_configure() {
unset QMAKESPEC
+ unset QTDIR
ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
+ echo "[Paths]" > $QT_CONF_PATH
+ echo "Prefix=${prefix}" >> $QT_CONF_PATH
+ echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Libraries=${libdir}" >> $QT_CONF_PATH
+ echo "Binaries=${bindir}" >> $QT_CONF_PATH
+ echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
+ echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
+ echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
+ echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
+
echo yes | ./configure -v \
-prefix ${prefix} \
-bindir ${bindir} \
-libdir ${libdir} \
- -datadir ${datadir} \
- -sysconfdir ${sysconfdir} \
+ -datadir ${datadir}/${QT_DIR_NAME} \
+ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
-docdir ${docdir}/${QT_DIR_NAME} \
-headerdir ${includedir}/${QT_DIR_NAME} \
-plugindir ${libdir}/${QT_DIR_NAME}/plugins \
@@ -37,9 +53,9 @@ do_configure() {
-platform ${TARGET_OS}-oe-g++ \
-xplatform ${TARGET_OS}-oe-g++ \
-embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
- -crossarch ${QT_ARCH}
+ -crossarch ${QT_ARCH} \
${QT_CONFIG_FLAGS} -fast \
- -L${STAGING_LIBDIR} -I${STAGING_INCDIR}
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
-I${STAGING_INCDIR}/freetype2
}