Skip to contentSkip to conversation

package/qt5base: disable feature-relocatable

PATCH New Peter Seiderer 3 participants 4 messages May 17, 2020 – May 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5base: disable feature-relocatable

Disable feature-relocatable to avoid a path mismatch while searching qml files and buildroot BR2_ROOTFS_MERGED_USR feature enabled.

As described in [1] with feature-relocatable Qt determines the search pathes relative to the location of libQt5Core.so, with BR2_ROOTFS_MERGED_USR enabled found first under the symlink path '/lib' instead of the install path '/usr/lib' and searches sequentially for qml files under '/qml' instead of the correct '/usr/qml'.

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12906

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4ac872639ed0dd3ae6627e05bdda821f7d128500

---
 package/qt5/qt5base/qt5base.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +5 -1
index 97315496b9..374285a825 100644
@@ -18,6 +18,9 @@ QT5BASE_INSTALL_STAGING = YES
 #     want to use the Buildroot packaged zlib
 #  * -system-pcre because pcre is mandatory to build Qt, and we
 #    want to use the one packaged in Buildroot
+#  * -no-feature-relocatable to work around path mismatch
+#     while searching qml files and buildroot BR2_ROOTFS_MERGED_USR
+#     feature enabled 
 QT5BASE_CONFIGURE_OPTS += \
 	-optimized-qmake \
 	-no-cups \
@@ -25,7 +28,8 @@ QT5BASE_CONFIGURE_OPTS += \
 	-system-zlib \
 	-system-pcre \
 	-no-pch \
-	-shared
+	-shared \
+	-no-feature-relocatable
 
 # starting from version 5.9.0, -optimize-debug is enabled by default
 # for debug builds and it overrides -O* with -Og which is not what we
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/qt5base: disable feature-relocatable

Peter, All,

On 2020-05-17 12:28 +0200, Peter Seiderer spake thusly:

Quoted 9 lines

Disable feature-relocatable to avoid a path mismatch while searching qml files and buildroot BR2_ROOTFS_MERGED_USR feature enabled.

As described in [1] with feature-relocatable Qt determines the search pathes relative to the location of libQt5Core.so, with BR2_ROOTFS_MERGED_USR enabled found first under the symlink path '/lib' instead of the install path '/usr/lib' and searches sequentially for qml files under '/qml' instead of the correct '/usr/qml'.

Quoted 7 lines

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12906

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4ac872639ed0dd3ae6627e05bdda821f7d128500

Applied to master, thanks. See a minor nit, below...

Quoted 9 lines
---
 package/qt5/qt5base/qt5base.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +0 -0
index 97315496b9..374285a825 100644

package/qt5/qt5base/qt5base.mk QT5BASE_INSTALL_STAGING = YES · line 23

Quoted 6 lines
package/qt5/qt5base/qt5base.mk +3 -0
@@ -18,6 +18,9 @@ QT5BASE_INSTALL_STAGING = YES
 #     want to use the Buildroot packaged zlib
 #  * -system-pcre because pcre is mandatory to build Qt, and we
 #    want to use the one packaged in Buildroot
+#  * -no-feature-relocatable to work around path mismatch
+#     while searching qml files and buildroot BR2_ROOTFS_MERGED_USR
+#     feature enabled 
    $ make check-package
    package/qt5/qt5base/qt5base.mk:23: line contains trailing whitespace

Fixed, and applied to master.

Regards,
Yann E. MORIN.

Quoted 20 lines
package/qt5/qt5base/qt5base.mk +2 -1
 QT5BASE_CONFIGURE_OPTS += \
 	-optimized-qmake \
 	-no-cups \
@@ -25,7 +28,8 @@ QT5BASE_CONFIGURE_OPTS += \
 	-system-zlib \
 	-system-pcre \
 	-no-pch \
-	-shared
+	-shared \
+	-no-feature-relocatable
 
 # starting from version 5.9.0, -optimize-debug is enabled by default
 # for debug builds and it overrides -O* with -Og which is not what we
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/qt5base: disable feature-relocatable

In reply to Peter Seiderer
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Disable feature-relocatable to avoid a path mismatch while searching qml files and buildroot BR2_ROOTFS_MERGED_USR feature enabled.

As described in [1] with feature-relocatable Qt determines the search pathes relative to the location of libQt5Core.so, with BR2_ROOTFS_MERGED_USR enabled found first under the symlink path '/lib' instead of the install path '/usr/lib' and searches sequentially for qml files under '/qml' instead of the correct '/usr/qml'.

Quoted 7 lines

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12906

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4ac872639ed0dd3ae6627e05bdda821f7d128500

This is only for Qt 5.14 (E.G. master and not 2020.02.x), right? From a quick look I don't see this option in the 5.12.8 version we have on the LTS branch.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 package/qt5base: disable feature-relocatable

Hello Peter,

Quoted 14 lines · Peter Korsgaard
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Disable feature-relocatable to avoid a path mismatch while searching qml files and buildroot BR2_ROOTFS_MERGED_USR feature enabled.

As described in [1] with feature-relocatable Qt determines the search pathes relative to the location of libQt5Core.so, with BR2_ROOTFS_MERGED_USR enabled found first under the symlink path '/lib' instead of the install path '/usr/lib' and searches sequentially for qml files under '/qml' instead of the correct '/usr/qml'.

Fixes:
- https://bugs.busybox.net/show_bug.cgi?id=12906

Quoted 9 lines
Quoted 4 lines

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4ac872639ed0dd3ae6627e05bdda821f7d128500

This is only for Qt 5.14 (E.G. master and not 2020.02.x), right? From a quick look I don't see this option in the 5.12.8 version we have on the LTS branch.

Yes...

Regards,
Peter