summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-09-09 19:51:27 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-09-09 19:51:27 +0000
commitbc5d1aeb4abce958f5ef75e495a97ffd28689707 (patch)
tree948694e1cf1b181bbf8a612318bfbd8ca79b7908
parente4dd9e171c270812e3af411b1fd50a215a9bdac3 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/09 18:33:53+02:00 uni-frankfurt.de!mickeyl uicmoc-native: use ccache and build makeqpf BKrev: 4140b43fT1g46nEyItUlCbLjGL9BFQ
-rw-r--r--uicmoc/uicmoc-native_2.3.7.oe5
1 files changed, 4 insertions, 1 deletions
diff --git a/uicmoc/uicmoc-native_2.3.7.oe b/uicmoc/uicmoc-native_2.3.7.oe
index 95a5df3919..332813983f 100644
--- a/uicmoc/uicmoc-native_2.3.7.oe
+++ b/uicmoc/uicmoc-native_2.3.7.oe
@@ -2,6 +2,7 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E)
SECTION = "tools"
PRIORITY = "optional"
LICENSE = "GPL/QPL"
+PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
file://fix-makefile.patch;patch=1 \
@@ -12,7 +13,7 @@ S = "${WORKDIR}/qt-${PV}"
inherit native qmake-base
export QTDIR = "${S}"
-EXTRA_OEMAKE = 'SYSCONF_LINK="${CXX}"'
+EXTRA_OEMAKE = 'SYSCONF_CXX="${CXX}" SYSCONF_LINK="${CXX}"'
CXXFLAGS += " -DQWS"
QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \
@@ -35,9 +36,11 @@ do_compile() {
oe_runmake -C tools/designer/util || die "Building libqutil.a failed"
oe_runmake -C tools/designer/uic || die "Building uic failed"
oe_runmake -C tools/qvfb || die "Building qvfb failed"
+ oe_runmake -C tools/makeqpf || die "Building makeqpf failed"
}
do_stage() {
install -m 0755 bin/moc ${STAGING_BINDIR}
install -m 0755 bin/uic ${STAGING_BINDIR}
+ install -m 0755 tools/makeqpf/makeqpf ${STAGING_BINDIR}
}