diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/qmake | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/qmake')
-rw-r--r-- | recipes/qmake/files/0001-fix-mkspecs.patch | 102 | ||||
-rw-r--r-- | recipes/qmake/files/common.pro | 108 | ||||
-rw-r--r-- | recipes/qmake/files/linux-oe-qmake.conf | 82 | ||||
-rw-r--r-- | recipes/qmake/files/qt-config.patch | 21 | ||||
-rw-r--r-- | recipes/qmake/files/use-lflags-last.patch | 22 | ||||
-rw-r--r-- | recipes/qmake/qmake-native_1.07a.bb | 46 | ||||
-rw-r--r-- | recipes/qmake/qmake2-native.inc | 72 | ||||
-rw-r--r-- | recipes/qmake/qmake2-native/linux-oe-qmake.conf | 1 | ||||
-rw-r--r-- | recipes/qmake/qmake2-native_2.10a.bb | 12 | ||||
-rw-r--r-- | recipes/qmake/qmake2-sdk/linux-oe-qmake.conf | 1 | ||||
-rw-r--r-- | recipes/qmake/qmake2-sdk_2.10a.bb | 17 |
11 files changed, 484 insertions, 0 deletions
diff --git a/recipes/qmake/files/0001-fix-mkspecs.patch b/recipes/qmake/files/0001-fix-mkspecs.patch new file mode 100644 index 0000000000..0fccb57c04 --- /dev/null +++ b/recipes/qmake/files/0001-fix-mkspecs.patch @@ -0,0 +1,102 @@ +--- /tmp/g++.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf 2008-07-08 10:34:15.000000000 +0200 +@@ -2,12 +2,12 @@ + # qmake configuration for common gcc + # + +-QMAKE_CC = gcc +-QMAKE_CFLAGS += -pipe ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS += -M + QMAKE_CFLAGS_WARN_ON += -Wall -W + QMAKE_CFLAGS_WARN_OFF += -w +-QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += + QMAKE_CFLAGS_DEBUG += -g + QMAKE_CFLAGS_SHLIB += -fPIC + QMAKE_CFLAGS_STATIC_LIB += -fPIC +@@ -16,8 +16,8 @@ + QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) + QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF +@@ -30,9 +30,9 @@ + QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS += ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE += + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += +@@ -41,7 +41,7 @@ + QMAKE_LFLAGS_SONAME += -Wl,-soname, + QMAKE_LFLAGS_THREAD += + QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_PCH_OUTPUT_EXT = .gch + +--- /tmp/linux.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf 2008-07-08 10:38:37.000000000 +0200 +@@ -7,26 +7,28 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) ++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = ++ + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) ++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) + QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_OPENGL = -lGLU -lGL + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) ++QMAKE_RCC = $(OE_QMAKE_RCC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_OBJCOPY = objcopy + QMAKE_RANLIB = + +@@ -39,7 +40,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/recipes/qmake/files/common.pro b/recipes/qmake/files/common.pro new file mode 100644 index 0000000000..382d93f5d1 --- /dev/null +++ b/recipes/qmake/files/common.pro @@ -0,0 +1,108 @@ +#==================================================================================== +# common.pro (C) 2004 Michael 'Mickey' Lauer <mickey@Vanille.de> +#==================================================================================== +# +# Purpose: This file contains qmake scope rules of common usage +# +# Example: When building a qmake based application using libsdl, +# use CONFIG+=sdl to add the proper include and library +# paths and definitions to the resulting Makefile +# +# +# General problem: One has to decide between evaluation at makefile generation time +# and evaluation at makefile processing time. +# The following example illustrates the difference: +# +# Evaluation at makefile processing time: +# +# sdl { +# QMAKE_CFLAGS += `sdl-config --cflags` +# LIBS += `sdl-config --libs` +# } +# +# Evalutation at makefile generation time: +# +# sdl { +# QMAKE_CFLAGS += $$system( sdl-config --cflags ) +# LIBS += `sdl-config --libs` +# } +# +# For now I use version 2 which is a bit faster +# See the fine qmake manual for more details +# +# + +#============================================================================= +# pthread scope for multithreaded applications +# + +pthread { + LIBS += -lpthread +} + +#============================================================================= +# sdl scopes for applications using the Simple Direct Media Layer (SDL) +# + +sdl { + QMAKE_CXXFLAGS += $$system( sdl-config --cflags ) + DEFINES += USE_SDL QTOPIA + LIBS += $$system( sdl-config --libs ) +} + +sdl-mixer { + LIBS += -lSDL_mixer +} + +sdl-image { + LIBS += -lSDL_image +} + +sdl-font { + LIBS += -lSDL_ttf +} + +#============================================================================= +# +# + +opie { + DEFINES += QWS +} + +opiecore { + LIBS += -lopiecore2 +} + +opieui { + CONFIG += opiecore + LIBS += -lopieui2 +} + +opienet { + CONFIG += opiecore + LIBS += -lopienet2 +} + +opiepim { + CONFIG += opiecore + LIBS += -lopiepim2 +} + +opiedb { + CONFIG += opiecore + LIBS += -lopiedb2 +} + +opiemm { + CONFIG += opiecore + LIBS += -lopiemm2 +} + +#============================================================================= +# +# + +#============================================================================= +# +# diff --git a/recipes/qmake/files/linux-oe-qmake.conf b/recipes/qmake/files/linux-oe-qmake.conf new file mode 100644 index 0000000000..205b693fda --- /dev/null +++ b/recipes/qmake/files/linux-oe-qmake.conf @@ -0,0 +1,82 @@ +# +# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release + +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_REENTRANT + +QMAKE_CXX = $(OE_QMAKE_CXX) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = +QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = + +QMAKE_LINK = $(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) +QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_DEBUG = +QMAKE_LFLAGS_SHLIB = -shared +QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB +QMAKE_LFLAGS_SONAME = -Wl,-soname, +QMAKE_LFLAGS_THREAD = +QMAKE_RPATH = -Wl,-rpath-link, + +QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = +QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) +QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt +QMAKE_LIBS_OPENGL = $(OE_QMAKE_LIBS_OPENGL) +QMAKE_LIBS_OPENGL_QT = $(OE_QMAKE_LIBS_OPENGL_QT) +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p + diff --git a/recipes/qmake/files/qt-config.patch b/recipes/qmake/files/qt-config.patch new file mode 100644 index 0000000000..3aa041aa51 --- /dev/null +++ b/recipes/qmake/files/qt-config.patch @@ -0,0 +1,21 @@ +--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 +@@ -47,6 +47,7 @@ + QT_BEGIN_NAMESPACE + extern QString qmake_libraryInfoFile(); + QT_END_NAMESPACE ++#include <stdlib.h> + #else + # include "qcoreapplication.h" + #endif +@@ -113,6 +114,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = config; ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC diff --git a/recipes/qmake/files/use-lflags-last.patch b/recipes/qmake/files/use-lflags-last.patch new file mode 100644 index 0000000000..4197dbbf64 --- /dev/null +++ b/recipes/qmake/files/use-lflags-last.patch @@ -0,0 +1,22 @@ +Index: qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp +=================================================================== +--- qtopia-core-opensource-src-4.3.1.orig/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:45:26.000000000 +0200 ++++ qtopia-core-opensource-src-4.3.1/qmake/generators/unix/unixmake2.cpp 2007-10-07 13:57:09.000000000 +0200 +@@ -416,7 +416,7 @@ + t << "\n\t" << mkdir_p_asstring(destdir) << "\n\t"; + if(!project->isEmpty("QMAKE_PRE_LINK")) + t << var("QMAKE_PRE_LINK") << "\n\t"; +- t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)"; ++ t << "$(LINK) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS) $(LFLAGS)"; + if(!project->isEmpty("QMAKE_POST_LINK")) + t << "\n\t" << var("QMAKE_POST_LINK"); + t << endl << endl; +@@ -430,7 +430,7 @@ + t << mkdir_p_asstring(destdir) << "\n\t"; + if(!project->isEmpty("QMAKE_PRE_LINK")) + t << var("QMAKE_PRE_LINK") << "\n\t"; +- t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)"; ++ t << "$(LINK) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LFLAGS)"; + if(!project->isEmpty("QMAKE_POST_LINK")) + t << "\n\t" << var("QMAKE_POST_LINK"); + t << endl << endl; diff --git a/recipes/qmake/qmake-native_1.07a.bb b/recipes/qmake/qmake-native_1.07a.bb new file mode 100644 index 0000000000..a80bb1bb92 --- /dev/null +++ b/recipes/qmake/qmake-native_1.07a.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL QPL" +PR = "r5" + +QTEVER = "qt-embedded-free-3.3.5" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTEVER}" + +inherit autotools native + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibcgnueabi-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 + oenote ./configure ${EXTRA_OECONF} + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -m 0755 bin/qmake ${STAGING_BINDIR} + install -d ${QMAKE_MKSPEC_PATH} + cp -fPR mkspecs/* ${QMAKE_MKSPEC_PATH} +} + +do_install() { + : +} diff --git a/recipes/qmake/qmake2-native.inc b/recipes/qmake/qmake2-native.inc new file mode 100644 index 0000000000..467f130f2e --- /dev/null +++ b/recipes/qmake/qmake2-native.inc @@ -0,0 +1,72 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL" +PR = "r5" + +# We call 'moc' during the build +DEPENDS = "uicmoc4-native" + +QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ + file://0001-fix-mkspecs.patch;patch=1 \ + file://qt-config.patch;patch=1 \ + file://use-lflags-last.patch;patch=1 \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTVER}" + +# we need the real target system here +CROSS_SYS := "${MULTIMACH_TARGET_SYS}" + +inherit autotools + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Make sure we regenerate all Makefiles + find ${S} -name "Makefile" | xargs rm + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ linux-uclibcgnueabi-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 + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + export OE_QMAKE_CC="${CC}" + export OE_QMAKE_CFLAGS="${CFLAGS}" + export OE_QMAKE_CXX="${CXX}" + export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" + export OE_QMAKE_LDFLAGS="${LDFLAGS}" + export OE_QMAKE_LINK="${CCLD}" + export OE_QMAKE_AR="${AR}" + export OE_QMAKE_STRIP="${STRIP}" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" + export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" + export OE_QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" + export QMAKE_RCC="${STAGING_BINDIR_NATIVE}/rcc4" + export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" + export OE_QMAKE_RPATH="-Wl,-rpath-link," + echo yes | ./configure -prefix ${STAGING_DIR_TARGET}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake-qt4 + + install -d ${CROSS_DATADIR}/qt4 + cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ +} diff --git a/recipes/qmake/qmake2-native/linux-oe-qmake.conf b/recipes/qmake/qmake2-native/linux-oe-qmake.conf new file mode 100644 index 0000000000..f58481a693 --- /dev/null +++ b/recipes/qmake/qmake2-native/linux-oe-qmake.conf @@ -0,0 +1 @@ +include(../linux-g++/qmake.conf) diff --git a/recipes/qmake/qmake2-native_2.10a.bb b/recipes/qmake/qmake2-native_2.10a.bb new file mode 100644 index 0000000000..4579838b43 --- /dev/null +++ b/recipes/qmake/qmake2-native_2.10a.bb @@ -0,0 +1,12 @@ +QTVERSION="4.4.3" +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" + +inherit native + +require ${PN}.inc + +do_install() { + : +} + + diff --git a/recipes/qmake/qmake2-sdk/linux-oe-qmake.conf b/recipes/qmake/qmake2-sdk/linux-oe-qmake.conf new file mode 100644 index 0000000000..f58481a693 --- /dev/null +++ b/recipes/qmake/qmake2-sdk/linux-oe-qmake.conf @@ -0,0 +1 @@ +include(../linux-g++/qmake.conf) diff --git a/recipes/qmake/qmake2-sdk_2.10a.bb b/recipes/qmake/qmake2-sdk_2.10a.bb new file mode 100644 index 0000000000..6ed9ebdebb --- /dev/null +++ b/recipes/qmake/qmake2-sdk_2.10a.bb @@ -0,0 +1,17 @@ +QTVERSION="4.4.3" +require qmake2-native.inc + +inherit sdk + +do_install () { + install -d ${D}/${bindir} + install -m 0755 bin/qmake ${D}/${bindir}/qmake2 + install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4 + install -d ${D}/${datadir}/qt4 + cp -PfR mkspecs ${D}/${datadir}/qt4/ +} + + + + + |