diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-03-24 11:25:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-24 11:25:46 +0000 |
| commit | 78c672fe882557a70b5a132353bd036223bc5be5 (patch) | |
| tree | 25c7335d5062ac83075c5771104081ad05e35307 | |
| parent | 0526fda9c4adef16007c4029d62e300110918adf (diff) | |
| parent | ad979cf10cea079510cff53d9d77fd2a39d45e2e (diff) | |
merge of 879120a741aec05639064e380f443dc99cf4ad9d
and dc67cfbdff715876fef8d430aad9f1b1b57abb78
| -rw-r--r-- | classes/qmake.bbclass | 2 | ||||
| -rw-r--r-- | packages/qmake/qmake-native_1.07a.bb | 21 | ||||
| -rw-r--r-- | packages/qmake/qmake-native_2.00a.bb | 20 |
3 files changed, 17 insertions, 26 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index 10aa8c9f7d..0d3f45c363 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -2,7 +2,7 @@ inherit qmake-base qmake_do_configure() { case ${QMAKESPEC} in - *linux-oe-g++|*linux-uclibc-oe-g++) + *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) ;; *-oe-g++) die Unsupported target ${TARGET_OS} for oe-g++ qmake spec diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index d3fd4c78cc..0b8c3e84ec 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r2" +PR = "r3" QTEVER = "qt-embedded-free-3.3.5" @@ -18,18 +18,13 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { - # Install the OE build templates (linux, linux-uclibc) - install -d ${S}/mkspecs/linux-oe-g++ - install -d ${S}/mkspecs/linux-uclibc-oe-g++ - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/linux-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-oe-g++/qplatformdefs.h - ln -sf ../linux-oe-g++/qmake.conf \ - ${S}/mkspecs/linux-uclibc-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-uclibc-oe-g++/qplatformdefs.h - + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done QMAKESPEC= PLATFORM=${HOST_OS}-oe-g++ export PLATFORM diff --git a/packages/qmake/qmake-native_2.00a.bb b/packages/qmake/qmake-native_2.00a.bb index cfee87472d..31e8a0d755 100644 --- a/packages/qmake/qmake-native_2.00a.bb +++ b/packages/qmake/qmake-native_2.00a.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "devel" LICENSE = "GPL QPL" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" @@ -20,17 +20,13 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { - # Install the OE build templates (linux, linux-uclibc) - install -d ${S}/mkspecs/linux-oe-g++ - install -d ${S}/mkspecs/linux-uclibc-oe-g++ - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/linux-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-oe-g++/qplatformdefs.h - ln -sf ../linux-oe-g++/qmake.conf \ - ${S}/mkspecs/linux-uclibc-oe-g++/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/linux-uclibc-oe-g++/qplatformdefs.h + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done QMAKESPEC= PLATFORM=${HOST_OS}-oe-g++ |