aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt3
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-08 18:24:08 +0000
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-12-08 19:53:03 +0000
commitd6eabbc05e39f78d50a0e6b9b41d356abc862741 (patch)
tree624542d9c61de06fc13516b1e74e4a93562ded1a /recipes-qt3
parent9d58aef10d75fe5168cc0c561c480c751266d54b (diff)
downloadmeta-qt3-d6eabbc05e39f78d50a0e6b9b41d356abc862741.tar.gz
meta-qt3-d6eabbc05e39f78d50a0e6b9b41d356abc862741.tar.bz2
meta-qt3-d6eabbc05e39f78d50a0e6b9b41d356abc862741.zip
qt-x11-free: fix installation and packaging
* You cannot install files into the sysroot, this will cause interaction problems with shared state. * Fixed packaging to install to sensible paths and remove most of the warnings. * Merged prepends/appends and their associated functions within the same recipe Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-qt3')
-rw-r--r--recipes-qt3/qt3/qt-x11-free-common.inc55
-rw-r--r--recipes-qt3/qt3/qt-x11-free_3.3.7.bb2
2 files changed, 24 insertions, 33 deletions
diff --git a/recipes-qt3/qt3/qt-x11-free-common.inc b/recipes-qt3/qt3/qt-x11-free-common.inc
index c92d883..1e00138 100644
--- a/recipes-qt3/qt3/qt-x11-free-common.inc
+++ b/recipes-qt3/qt3/qt-x11-free-common.inc
@@ -3,7 +3,7 @@ SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "GPL | QPL"
HOMEPAGE = "http://www.trolltech.com"
-INC_PR = "r3"
+INC_PR = "r4"
S = "${WORKDIR}/qt-x11-free-${PV}"
@@ -11,7 +11,6 @@ S = "${WORKDIR}/qt-x11-free-${PV}"
inherit qmake_base qt3x11
export QTDIR = "${S}"
-STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
ARCH_i686 = "x86"
EXTRA_OEMAKE = "-e"
@@ -24,13 +23,11 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INC
AR="${TARGET_PREFIX}ar cqs" \
MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
-do_configure_prepend() {
- if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then
- ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++
- fi
-}
-
do_configure() {
+ if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then
+ ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++
+ fi
+
echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \
-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
@@ -56,43 +53,37 @@ do_compile() {
oe_runmake -C tools ${EXTRA_ENV}
}
-do_install_prepend() {
- install -d ${STAGING_QT_DIR}/bin
- ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
- ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
- ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
- install -d ${STAGING_QT_DIR}/lib
- oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
- install -d ${STAGING_QT_DIR}/include/private
+do_install() {
+ install -d ${D}${includedir}
+ install -d ${D}${includedir}/qt3
+ install -d ${D}${includedir}/qt3/private
for f in include/*.h
do
- install -m 0644 $f ${STAGING_QT_DIR}/include/
+ install -m 0644 $f ${D}${includedir}/qt3
done
for f in include/private/*.h
do
- install -m 0644 $f ${STAGING_QT_DIR}/include/private
+ install -m 0644 $f ${D}${includedir}/qt3/private
done
+ install -d ${D}${libdir}
+ install -d ${D}${libdir}/qt3
for f in lib/*.prl
do
- install -m 0644 $f ${STAGING_QT_DIR}/lib
+ install -m 0644 $f ${D}${libdir}/qt3
done
-}
-
-do_install() {
- install -d ${D}${libdir}/
- oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
- install -d ${D}${bindir}/
- install -d ${D}${prefix}/plugins/
- cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+ oe_libinstall -so -C lib libqt-mt ${D}${libdir}
+ install -d ${D}${libdir}/qt3/plugins/
+ cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${libdir}/qt3/plugins/
}
PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
-FILES_libqt-mt3 = "${D}/{libdir}/libqt-mt*"
-FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
-FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
-FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
+FILES_libqt-mt3 = "${libdir}/libqt-mt.so.*"
+FILES_${PN}-dev += "${libdir}/qt3/*.prl"
+FILES_qt-x11-plugins-imageformats = "${libdir}/qt3/plugins/imageformats/*.so"
+FILES_qt-x11-plugins-sqldrivers = "${libdir}/qt3/plugins/sqldrivers/*.so"
+FILES_qt-x11-plugins-designer = "${libdir}/qt3/plugins/designer/*.so"
FILES_qt-x11-designer = "${bindir}/designer"
FILES_qt-x11-assistant = "${bindir}/assistant"
FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
-FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
+FILES_${PN}-dbg += "${libdir}/qt3/plugins/*/.debug"
diff --git a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
index a67dd63..cf3b878 100644
--- a/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
+++ b/recipes-qt3/qt3/qt-x11-free_3.3.7.bb
@@ -1,6 +1,6 @@
DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
PROVIDES = "qt3x11"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"