diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 11:28:23 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 11:28:23 +0200 |
| commit | 6858e21b523b98271d195627e5b7d3587feebce9 (patch) | |
| tree | e98847ce0a2b3c27eda68f2c9280e2c2a8ca0a24 | |
| parent | 9a3f1f038abc2e699a839bc4cba921acdcd68666 (diff) | |
| download | buildroot-6858e21b523b98271d195627e5b7d3587feebce9.tar.gz buildroot-6858e21b523b98271d195627e5b7d3587feebce9.zip | |
Revert "package/qt5base: provide "qt.conf" to make "qmake" relocatable"
This reverts commit a2efb84dec42608e46860a24c31db5a4588edd1e, as it
causes files to be installed in an invalid location, causing build
failures.
Fixes:
http://autobuild.buildroot.net/results/a1a9eeb7fec07a2f9f0d05e6c1900ad7cffb6656/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/qt5/qt5base/qt.conf.in | 6 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/package/qt5/qt5base/qt.conf.in b/package/qt5/qt5base/qt.conf.in deleted file mode 100644 index 48e4b92bcd..0000000000 --- a/package/qt5/qt5base/qt.conf.in +++ /dev/null @@ -1,6 +0,0 @@ -[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 3e55002264..5fe8bb884b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -258,17 +258,9 @@ 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 |
