diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-12-08 18:24:08 +0000 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-12-08 19:53:03 +0000 |
commit | d6eabbc05e39f78d50a0e6b9b41d356abc862741 (patch) | |
tree | 624542d9c61de06fc13516b1e74e4a93562ded1a /recipes-qt3 | |
parent | 9d58aef10d75fe5168cc0c561c480c751266d54b (diff) | |
download | meta-qt3-d6eabbc05e39f78d50a0e6b9b41d356abc862741.tar.gz |
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.inc | 55 | ||||
-rw-r--r-- | recipes-qt3/qt3/qt-x11-free_3.3.7.bb | 2 |
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" | |||
3 | PRIORITY = "optional" | 3 | PRIORITY = "optional" |
4 | LICENSE = "GPL | QPL" | 4 | LICENSE = "GPL | QPL" |
5 | HOMEPAGE = "http://www.trolltech.com" | 5 | HOMEPAGE = "http://www.trolltech.com" |
6 | INC_PR = "r3" | 6 | INC_PR = "r4" |
7 | 7 | ||
8 | S = "${WORKDIR}/qt-x11-free-${PV}" | 8 | S = "${WORKDIR}/qt-x11-free-${PV}" |
9 | 9 | ||
@@ -11,7 +11,6 @@ S = "${WORKDIR}/qt-x11-free-${PV}" | |||
11 | inherit qmake_base qt3x11 | 11 | inherit qmake_base qt3x11 |
12 | 12 | ||
13 | export QTDIR = "${S}" | 13 | export QTDIR = "${S}" |
14 | STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3" | ||
15 | ARCH_i686 = "x86" | 14 | ARCH_i686 = "x86" |
16 | EXTRA_OEMAKE = "-e" | 15 | EXTRA_OEMAKE = "-e" |
17 | 16 | ||
@@ -24,13 +23,11 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INC | |||
24 | AR="${TARGET_PREFIX}ar cqs" \ | 23 | AR="${TARGET_PREFIX}ar cqs" \ |
25 | MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' | 24 | MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"' |
26 | 25 | ||
27 | do_configure_prepend() { | ||
28 | if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then | ||
29 | ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ | ||
30 | fi | ||
31 | } | ||
32 | |||
33 | do_configure() { | 26 | do_configure() { |
27 | if [ ! -L ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ ]; then | ||
28 | ln -sf ${QMAKE_MKSPEC_PATH}/linux-g++ ${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++ | ||
29 | fi | ||
30 | |||
34 | echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ | 31 | echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \ |
35 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql | 32 | -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql |
36 | 33 | ||
@@ -56,43 +53,37 @@ do_compile() { | |||
56 | oe_runmake -C tools ${EXTRA_ENV} | 53 | oe_runmake -C tools ${EXTRA_ENV} |
57 | } | 54 | } |
58 | 55 | ||
59 | do_install_prepend() { | 56 | do_install() { |
60 | install -d ${STAGING_QT_DIR}/bin | 57 | install -d ${D}${includedir} |
61 | ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc | 58 | install -d ${D}${includedir}/qt3 |
62 | ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic | 59 | install -d ${D}${includedir}/qt3/private |
63 | ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake | ||
64 | install -d ${STAGING_QT_DIR}/lib | ||
65 | oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib | ||
66 | install -d ${STAGING_QT_DIR}/include/private | ||
67 | for f in include/*.h | 60 | for f in include/*.h |
68 | do | 61 | do |
69 | install -m 0644 $f ${STAGING_QT_DIR}/include/ | 62 | install -m 0644 $f ${D}${includedir}/qt3 |
70 | done | 63 | done |
71 | for f in include/private/*.h | 64 | for f in include/private/*.h |
72 | do | 65 | do |
73 | install -m 0644 $f ${STAGING_QT_DIR}/include/private | 66 | install -m 0644 $f ${D}${includedir}/qt3/private |
74 | done | 67 | done |
68 | install -d ${D}${libdir} | ||
69 | install -d ${D}${libdir}/qt3 | ||
75 | for f in lib/*.prl | 70 | for f in lib/*.prl |
76 | do | 71 | do |
77 | install -m 0644 $f ${STAGING_QT_DIR}/lib | 72 | install -m 0644 $f ${D}${libdir}/qt3 |
78 | done | 73 | done |
79 | } | 74 | oe_libinstall -so -C lib libqt-mt ${D}${libdir} |
80 | 75 | install -d ${D}${libdir}/qt3/plugins/ | |
81 | do_install() { | 76 | cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${libdir}/qt3/plugins/ |
82 | install -d ${D}${libdir}/ | ||
83 | oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ | ||
84 | install -d ${D}${bindir}/ | ||
85 | install -d ${D}${prefix}/plugins/ | ||
86 | cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/ | ||
87 | } | 77 | } |
88 | 78 | ||
89 | PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ | 79 | PACKAGES =+ " libqt-mt3 qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ |
90 | qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" | 80 | qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" |
91 | FILES_libqt-mt3 = "${D}/{libdir}/libqt-mt*" | 81 | FILES_libqt-mt3 = "${libdir}/libqt-mt.so.*" |
92 | FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so" | 82 | FILES_${PN}-dev += "${libdir}/qt3/*.prl" |
93 | FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so" | 83 | FILES_qt-x11-plugins-imageformats = "${libdir}/qt3/plugins/imageformats/*.so" |
94 | FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so" | 84 | FILES_qt-x11-plugins-sqldrivers = "${libdir}/qt3/plugins/sqldrivers/*.so" |
85 | FILES_qt-x11-plugins-designer = "${libdir}/qt3/plugins/designer/*.so" | ||
95 | FILES_qt-x11-designer = "${bindir}/designer" | 86 | FILES_qt-x11-designer = "${bindir}/designer" |
96 | FILES_qt-x11-assistant = "${bindir}/assistant" | 87 | FILES_qt-x11-assistant = "${bindir}/assistant" |
97 | FILES_qt-x11-qtconfig = "${bindir}/qtconfig" | 88 | FILES_qt-x11-qtconfig = "${bindir}/qtconfig" |
98 | FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug" | 89 | 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 @@ | |||
1 | DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl" | 1 | DEPENDS = "qt-x11-free-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl" |
2 | PROVIDES = "qt3x11" | 2 | PROVIDES = "qt3x11" |
3 | PR = "${INC_PR}.1" | 3 | PR = "${INC_PR}.0" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \ |
6 | file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b" | 6 | file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b" |