From: Wolfgang Grandegger <wg@grandegger.com>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC PATCH v3 10/10] package/qt5base: provide "qt.conf" to make "qmake" relocatable
Date: Thu, 23 Mar 2017 08:54:53 +0100 [thread overview]
Message-ID: <1490255693-9134-11-git-send-email-wg@grandegger.com> (raw)
In-Reply-To: <1490255693-9134-1-git-send-email-wg@grandegger.com>
The file "qt.conf" can be used to override the hard-coded paths that are
compiled into the Qt library. We need it to make "qmake" relocatable.
CC: Julien Corjon <corjon.j@ecagroup.com>
CC: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
---
package/qt5/qt5base/qt.conf.in | 6 ++++++
package/qt5/qt5base/qt5base.mk | 8 ++++++++
2 files changed, 14 insertions(+)
create mode 100644 package/qt5/qt5base/qt.conf.in
diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in
new file mode 100644
index 0000000..48e4b92
--- /dev/null
+++ b/package/qt5/qt5base/qt.conf.in
@@ -0,0 +1,6 @@
+[Paths]
+Prefix=@@HOST_DIR@@/usr
+Sysroot=@@STAGING_DIR@@
+Headers=/usr/include/qt5
+Plugins=/usr/lib/qt/plugins
+Examples=/usr/lib/qt/examples
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 1020348..e42e395 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -253,9 +253,17 @@ define QT5BASE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
+# The file "qt.conf" can be used to override the hard-coded paths that are
+# compiled into the Qt library. We need it to make "qmake" relocatable.
+define QT5BASE_INSTALL_QT_CONF
+ sed -e "s\\@@HOST_DIR@@\\$(HOST_DIR)\\" -e "s\\@@STAGING_DIR@@\\$(STAGING_DIR)\\" \
+ $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/usr/bin/qt.conf
+endef
+
define QT5BASE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP)
+ $(QT5BASE_INSTALL_QT_CONF)
endef
define QT5BASE_INSTALL_TARGET_LIBS
--
1.9.1
next prev parent reply other threads:[~2017-03-23 7:54 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 7:54 [Buildroot] [RFC PATCH v3 00/10] Make the SDK relocatable Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 01/10] package/patchelf: use most recent version as a base for rpath sanitation Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 02/10] package/patchelf: add patch for rpath sanitation under a root directory Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 03/10] support/scripts: add fix-rpath script to sanitize the rpath Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 04/10] core: sanitize RPATH in host tree at the very end of the build Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 05/10] core: sanitize RPATH in target tree at the end of the target finalization Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 06/10] support/scripts: add reloacte-sdk.sh script for SDK relocation Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 07/10] core: install relocation script and location at the end of the build Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 08/10] external-toolchain: check if a buildroot SDK has already been relocated Wolfgang Grandegger
2017-03-23 7:54 ` [Buildroot] [RFC PATCH v3 09/10] support/scripts: check-host-rpath now handles $ORIGIN as well Wolfgang Grandegger
2017-03-23 7:54 ` Wolfgang Grandegger [this message]
2017-04-12 13:59 ` [Buildroot] [RFC PATCH v3 00/10] Make the SDK relocatable Arnout Vandecappelle
2017-04-27 9:37 ` Wolfgang Grandegger
2017-06-21 7:59 ` Wolfgang Grandegger
2017-06-21 21:03 ` Arnout Vandecappelle
2017-06-21 21:06 ` Arnout Vandecappelle
2017-06-27 10:54 ` Wolfgang Grandegger
2017-06-27 22:41 ` Arnout Vandecappelle
2017-06-28 6:51 ` Wolfgang Grandegger
2017-06-28 10:44 ` Arnout Vandecappelle
2017-06-28 10:59 ` Wolfgang Grandegger
2017-06-22 6:37 ` Wolfgang Grandegger
2017-06-27 22:47 ` Arnout Vandecappelle
2017-06-28 6:40 ` Peter Korsgaard
2017-06-28 6:45 ` Wolfgang Grandegger
2017-06-28 10:41 ` Arnout Vandecappelle
2017-06-28 10:57 ` Wolfgang Grandegger
2017-06-28 11:16 ` Arnout Vandecappelle
2017-06-28 12:36 ` Wolfgang Grandegger
2017-06-28 19:33 ` Arnout Vandecappelle
2017-06-29 6:13 ` Wolfgang Grandegger
2017-06-29 8:02 ` Wolfgang Grandegger
2017-06-30 8:50 ` Wolfgang Grandegger
2017-06-30 9:14 ` Wolfgang Grandegger
2017-06-30 10:25 ` Arnout Vandecappelle
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=1490255693-9134-11-git-send-email-wg@grandegger.com \
--to=wg@grandegger.com \
--cc=buildroot@busybox.net \
/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