mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/qt5base: provide "qt.conf" to make "qmake" relocatable"

Browse Source 
This reverts commit a2efb84dec, 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>
This commit is contained in:
Thomas Petazzoni
2017-07-05 11:28:23 +02:00
parent 9a3f1f038a
commit 6858e21b52
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/qt5/qt5base/qt.conf.in
View File

@@ -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

8
package/qt5/qt5base/qt5base.mk
View File

@@ -258,17 +258,9 @@ define QT5BASE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef 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 define QT5BASE_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
$(QT5_LA_PRL_FILES_FIXUP) $(QT5_LA_PRL_FILES_FIXUP)
$(QT5BASE_INSTALL_QT_CONF)
endef endef
define QT5BASE_INSTALL_TARGET_LIBS define QT5BASE_INSTALL_TARGET_LIBS