From: Marco Felsch <m.felsch@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [RFC PATCH 3/3] qt5: add capability to build from git super project
Date: Thu, 12 Mar 2020 12:35:16 +0100 [thread overview]
Message-ID: <20200312113516.21154-3-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20200312113516.21154-1-m.felsch@pengutronix.de>
This adds the capability to build qt from the git super project. I
replaced the '-release' with '-developer-build' since building from git
is only useful for developers which often need more debug information.
The qtpim and qtdocgallery packages are only available on the qt5
git super project. The release tar doesn't contain those modules yet.
Anyway, those modules can't be compiled yet so we need to skip those.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
rules/qt5.in | 15 +++++++++++++++
rules/qt5.make | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/rules/qt5.in b/rules/qt5.in
index b5b6e2bfb..40380feaa 100644
--- a/rules/qt5.in
+++ b/rules/qt5.in
@@ -87,6 +87,11 @@ config QT5_LIBXKBCOMMON
bool
default QT5_PLATFORM_XCB || QT5_MODULE_QTWAYLAND || QT5_INPUT_LIBINPUT
+config QT5_DEVEL_BUILD
+ bool
+ default n
+ prompt "Enable developer build"
+
if QT5_PLATFORM_XCB
config QT5_X11
@@ -711,6 +716,16 @@ config QT5_MODULE_QTXMLPATTERNS
bool
prompt "QtXmlPatterns"
+config QT5_MODULE_QTPIM
+ bool
+ depends on BROKEN
+ prompt "QtPim"
+
+config QT5_MODULE_QTDOCGALLERY
+ bool
+ depends on BROKEN
+ prompt "QtDocGallery"
+
endmenu
endif
diff --git a/rules/qt5.make b/rules/qt5.make
index e70fefe25..5f8ccb9e3 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -112,7 +112,7 @@ QT5_CONF_OPT := \
$(if $(filter 1,$(PTXDIST_VERBOSE)),-v) \
-opensource \
-confirm-license \
- -release \
+ $(call ptx/ifdef, PTXCONF_QT5_DEVEL_BUILD, -developer-build, -release) \
--disable-optimized-tools \
--disable-separate-debug-info \
--disable-gdb-index \
@@ -140,6 +140,7 @@ QT5_CONF_OPT := \
$(call ptx/qt5-module, QTDATAVIS3D, qtdatavis3d) \
$(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \
-skip qtdoc \
+ $(call ptx/qt5-module, QTDOCGALLERY, qtdocgallery) \
$(call ptx/qt5-module, QTGAMEPAD, qtgamepad) \
$(call ptx/qt5-module, QTGRAPHICALEFFECTS, qtgraphicaleffects) \
$(call ptx/qt5-module, QTIMAGEFORMATS, qtimageformats) \
@@ -147,6 +148,7 @@ QT5_CONF_OPT := \
-skip qtmacextras \
$(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \
$(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \
+ $(call ptx/qt5-module, QTPIM, qtpim) \
$(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \
$(call ptx/qt5-module, QT3D_QUICK, qtquick3d) \
$(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2020-03-12 11:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 11:35 [ptxdist] [RFC PATCH 1/3] qt5: version bump 5.12.6 -> 5.14.1 Marco Felsch
2020-03-12 11:35 ` [ptxdist] [RFC PATCH 2/3] qt5: drop qtdeclarative opengl dependency Marco Felsch
2020-06-19 22:04 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-03-12 11:35 ` Marco Felsch [this message]
2020-04-10 10:48 ` [ptxdist] [RFC PATCH 1/3] qt5: version bump 5.12.6 -> 5.14.1 Marco Felsch
2020-06-19 22:04 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312113516.21154-3-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox