Skip to contentSkip to conversation

qt5: install headers into /usr/include/qt5

PATCH New Fatih Aşıcı 2 participants 5 messages Dec 24, 2013 – Dec 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt5: install headers into /usr/include/qt5

There are places in Qt's source where headers included with the name of the module subdirectory (e.g. #include <QtCore/QHash>). Therefore, the build system passes the top header directory to the compiler; but this results in a error when building host tools since sysroot/usr/include directory includes architecture specific system headers.

In order to prevent this, install all Qt headers into a subdirectory in /usr/include.

---
 package/qt5/qt5base/qt5base.mk | 1 +
 1 file changed, 1 insertion(+)
package/qt5/qt5base/qt5base.mk +1 -0
index 1b753d3..e46bdeb 100644
@@ -159,6 +159,7 @@ define QT5BASE_CONFIGURE_CMDS
 		-v \
 		-prefix /usr \
 		-hostprefix $(HOST_DIR)/usr \
+		-headerdir /usr/include/qt5 \
 		-sysroot $(STAGING_DIR) \
 		-plugindir /usr/lib/qt/plugins \
 		-no-rpath \
Signature · 1 line
1.8.5.1
#1 lore raw

PATCH 1/1 qt5: install headers into /usr/include/qt5

Dear Fatih A??c?,

Quoted 6 lines · Fatih A??c?

There are places in Qt's source where headers included with the name of the module subdirectory (e.g. #include <QtCore/QHash>). Therefore, the build system passes the top header directory to the compiler; but this results in a error when building host tools since sysroot/usr/include directory includes architecture specific system headers.

Quoted 6 lines

In order to prevent this, install all Qt headers into a subdirectory in /usr/include.

With this change, what does the compilation command line of host tools look like?

To me, this change seems more like work-arounding a problem in the Qt build system rather than a real fix.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 qt5: install headers into /usr/include/qt5

Quoted 12 lines · On Tuesday 24 December 2013 09:47:20 Thomas Petazzoni wrote:

Dear Fatih A??c?,

Quoted 9 lines · Fatih A??c?

There are places in Qt's source where headers included with the name of the module subdirectory (e.g. #include <QtCore/QHash>). Therefore, the build system passes the top header directory to the compiler; but this results in a error when building host tools since sysroot/usr/include directory includes architecture specific system headers.

In order to prevent this, install all Qt headers into a subdirectory in /usr/include.

Quoted 8 lines
Quoted 5 lines

Fixes:
http://autobuild.buildroot.net/results/4f1/4f16c0b38bdd6e40efcc781c12fae
81c0bfabb72/

With this change, what does the compilation command line of host tools look like?

g++ -c -pipe -O2 -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions -Wall -W -D_REENTRANT -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON - DQT_BUILD_QMLDEVTOOLS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS - DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED - DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES - DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_QMAKE_LOCATION="/home/fatih/git/buildroot/output/build/qt5base-5.2.0/bin/qmake" - I/home/fatih/git/buildroot/output/host/usr/mkspecs/linux-g++ -I. -I../../include -I../../include/QtQml -I../../include/QtQml/5.2.0 -I../../include/QtQml/5.2.0/QtQml -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/qt5 -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot- linux-uclibcgnueabi/sysroot/usr/include/qt5/QtCore -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/qt5/QtXml - I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/qt5/QtCore/5.2.0 -I/home/fatih/git/buildroot/output/host/usr/arm- buildroot-linux-uclibcgnueabi/sysroot/usr/include/qt5/QtCore/5.2.0/QtCore -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux- uclibcgnueabi/sysroot/usr/include/qt5/QtXml/5.2.0 -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux- uclibcgnueabi/sysroot/usr/include/qt5/QtXml/5.2.0/QtXml -o .obj/qqmljsparser.o ../qml/parser/qqmljsparser.cpp

Quoted 2 lines

To me, this change seems more like work-arounding a problem in the Qt build system rather than a real fix.

Upstream states[1] that including qt headers from sysroot is not a problem since they don't contain anything platform-specific.

[1] https://bugreports.qt-project.org/browse/QTBUG-35330?focusedCommentId=224486&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-224486
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131224/31cb87b4/attachment-0001.html>

#3 lore raw

PATCH 1/1 qt5: install headers into /usr/include/qt5

Dear Fatih A??c?,

Quoted 7 lines · Fatih A??c?

g++ -c -pipe -O2 -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions -Wall -W -D_REENTRANT -DQT_NO_LIBUDEV -DQT_NO_XCB -DQT_NO_XKBCOMMON - DQT_BUILD_QMLDEVTOOLS_LIB -DQT_BUILDING_QT -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER -DQT_DEPRECATED_WARNINGS - DQT_DISABLE_DEPRECATED_BEFORE=0x050000 -DQT_NO_EXCEPTIONS -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_BOOTSTRAP_LIB -DQT_BOOTSTRAPPED - DQT_LITE_UNICODE -DQT_NO_CAST_TO_ASCII -DQT_NO_CODECS -DQT_NO_DATASTREAM -DQT_NO_LIBRARY -DQT_NO_QOBJECT -DQT_NO_SYSTEMLOCALE -DQT_NO_THREAD -DQT_NO_UNICODETABLES - DQT_NO_USING_NAMESPACE -DQT_NO_DEPRECATED -DQT_NO_TRANSLATION -DQT_QMAKE_LOCATION="/home/fatih/git/buildroot/output/build/qt5base-5.2.0/bin/qmake" - I/home/fatih/git/buildroot/output/host/usr/mkspecs/linux-g++ -I. -I../../include -I../../include/QtQml -I../../include/QtQml/5.2.0 -I../../include/QtQml/5.2.0/QtQml -I/home/fatih/git/buildroot/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/qt5

This is still really ugly, as it is including target headers when doing a compilation for the host. If they know what they are doing and know that including Qt headers is fine and needed, then they should include them from the Qt source tree and not from the Qt installation tree.

Quoted 7 lines
Quoted 2 lines

To me, this change seems more like work-arounding a problem in the Qt build system rather than a real fix.

Upstream states[1] that including qt headers from sysroot is not a problem since they don't contain anything platform-specific.

[1] https://bugreports.qt-project.org/browse/QTBUG-35330?focusedCommentId=224486&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-224486

I don't really agree, but if that's what upstream recommends, then ok for the patch.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/1 qt5: install headers into /usr/include/qt5

In reply to Fatih Aşıcı

Dear Fatih A??c?,

Quoted 9 lines · Fatih A??c?

There are places in Qt's source where headers included with the name of the module subdirectory (e.g. #include <QtCore/QHash>). Therefore, the build system passes the top header directory to the compiler; but this results in a error when building host tools since sysroot/usr/include directory includes architecture specific system headers.

In order to prevent this, install all Qt headers into a subdirectory in /usr/include.

Quoted 6 lines
---
 package/qt5/qt5base/qt5base.mk | 1 +
 1 file changed, 1 insertion(+)

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com