Makefile.build is only used when building from within SDK through a top-level SDK Makefile.
Signed-off-by: Jacob Stiffler <[email protected]> --- ...uild-with-Qt5-use-qmake-available-in-PATH.patch | 31 ++++++++++++++++++++ .../recipes-qt/qt-apps/image-gallery_git.bb | 8 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch diff --git a/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch b/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch new file mode 100644 index 0000000..0963797 --- /dev/null +++ b/meta-arago-extras/recipes-qt/qt-apps/image-gallery/0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch @@ -0,0 +1,31 @@ +From 6b6a4b55c7ec53384fbbb8a9b0ba95350e7118b7 Mon Sep 17 00:00:00 2001 +From: Jacob Stiffler <[email protected]> +Date: Wed, 4 Mar 2015 11:59:53 -0500 +Subject: [PATCH] Makefile.build: with Qt5 use qmake available in PATH + +Signed-off-by: Jacob Stiffler <[email protected]> +--- + Makefile.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.build b/Makefile.build +index fc3f14c..0afe5c0 100644 +--- a/Makefile.build ++++ b/Makefile.build +@@ -9,11 +9,11 @@ all: release + .PHONY: qmake + qmake : image-gallery.pro + @. ${ENV_SETUP}; \ +- qmake2 CONFIG+=release image-gallery.pro ++ qmake CONFIG+=release image-gallery.pro + + qmake_debug : image-gallery.pro + @. ${ENV_SETUP}; \ +- qmake2 CONFIG+=debug image-gallery.pro ++ qmake CONFIG+=debug image-gallery.pro + + debug : qmake_debug + @. ${ENV_SETUP}; \ +-- +1.7.9.5 + diff --git a/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb b/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb index 72c9389..ad10de9 100644 --- a/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb +++ b/meta-arago-extras/recipes-qt/qt-apps/image-gallery_git.bb @@ -8,13 +8,19 @@ require recipes-core/matrix/matrix-gui-paths.inc inherit qt-provider -PR = "r2" +PR = "r3" BRANCH = "master" SRCREV = "1f89d5e6c160e87e73a9c06933e50c3981bbf41d" SRC_URI = "git://gitorious.org/image-gallery/image-gallery.git;protocol=git;branch=${BRANCH}" +QT5_DIFF = " \ + file://0001-Makefile.build-with-Qt5-use-qmake-available-in-PATH.patch \ +" + +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', "${QT5_DIFF}", '', d)}" + S = "${WORKDIR}/git/" do_install() { -- 1.7.9.5 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
