From: Wolfgang Grandegger Date: Thu, 20 Jul 2017 14:35:21 +0000 (+0200) Subject: package/qt5base: provide "qt.conf" to make "qmake" relocatable X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3aaea7ace2a24d0d577b553613a86013c384b1c3;p=buildroot.git package/qt5base: provide "qt.conf" to make "qmake" relocatable The file "qt.conf" can be used to override the hard-coded paths that are compiled into the Qt library. This is required to make "qmake" relocatable. Actually, we need to specify all variables to overwrite the compiled in values. CC: Julien Corjon CC: Peter Seiderer Signed-off-by: Wolfgang Grandegger Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in new file mode 100644 index 0000000000..9a0b9cd53b --- /dev/null +++ b/package/qt5/qt5base/qt.conf.in @@ -0,0 +1,19 @@ +[Paths] +Prefix=@@HOST_DIR@@ +Sysroot=@@STAGING_DIR@@ +Headers=/usr/include/qt5 +Libraries=/usr/lib +LibraryExecutables=/usr/libexec +Binaries=/usr/bin +Plugins=/usr/lib/qt/plugins +Examples=/usr/lib/qt/examples +Qml2Imports=/usr/qml +Imports=/usr/imports +Translations=/usr/translations +Examples=/usr/lib/qt/examples +Demos=/usr/lib/qt/examples +Tests=/usr/tests +Settings=/usr +Documentation=/usr/doc +ArchData=/usr +Data=/usr diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 92633af8d9..bbbdd41209 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -264,9 +264,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)/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