From patchwork Sun May 17 10:28:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1292112 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=AKOWnvbO; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49PyzX4Q1Gz9sT8 for ; Sun, 17 May 2020 20:28:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 24D0C8801A; Sun, 17 May 2020 10:28:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fw+dRJ1nM6eI; Sun, 17 May 2020 10:28:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B2E287DBA; Sun, 17 May 2020 10:28:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7E2601BF46A for ; Sun, 17 May 2020 10:28:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A8EE87F60 for ; Sun, 17 May 2020 10:28:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LmUnPJVzCz-b for ; Sun, 17 May 2020 10:28:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by whitealder.osuosl.org (Postfix) with ESMTPS id B259F87DB2 for ; Sun, 17 May 2020 10:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1589711305; bh=XXKmomMuT/+sBT4H2XuBpADDyeLJK3MRnj/kGsAtEKE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=AKOWnvbOS68Un6eIC3Tc3sADxrg00qf9TR0O/TmteQ8YB/xrblENIJVwiqOmYnH3N 8s9wfkAZPx4bJ1qq2FkqOvnPVVDRCiPJm8cei472QVZHBeY1bohm5TUkvSOXYyb0if Y+DT/zSIP6gfD2wFaVb08VLvMdmkTRN3UU3F0NWA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.52]) by mail.gmx.com (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MBm1e-1jmPcT27LA-00C8dL; Sun, 17 May 2020 12:28:25 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Sun, 17 May 2020 12:28:23 +0200 Message-Id: <20200517102823.15132-1-ps.report@gmx.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:1HivuRPPY0RiSB4Ci/xNRYyvSTT6uYJFz90BlwTLCIF6pxBTnzy P9NfBMgCxCkjsAreBQ8X4PUQEtbSwCU1x8VQOgEm2TDQEisH07YfimIGqjtq6rUDSUdKogZ nd88+lBaF4UHLYQDmI+Z09qd+wpqUPLgddvGhy0jcjxYf6AWW4BMxdnAtEzVUjWBgaCESVE wSXWjKW7aj3OBVGSB5IKw== X-UI-Out-Filterresults: notjunk:1;V03:K0:vW4b5j7sLuU=:ITv/1j0YbAXjelGd4lSz7N FperHL1UO3wyFbpQJd8UqsOGZr1MUEcuMsnaZf1BULg3waHXii5++cdEeeIkPQ2lWgi+oXBlx TJF+hhTKsqlM7Rgc3yfqo8NqAxTuaKQW0FNuvJJtUSCskYTaLafyZwDEEN+eR0I89YXFhncaf +ASuaNgf9OmcE0iS72/miwYKZwCdvF+risjOSVV7FfewSmIjoTv13fzuTfQT7K0zkCZQWpLEx RjNFKEOqVYvn4iUH2ecMzDShjoIR9izobRm2oLxs/yV1QnLD8gX06Y14bGMcQs95lM/xdGucj JPP3ya2w7loSBJhuOXTsZXCRaC2CFEnShWoBNUfloe/YjdZsEnsRpyxGGLupNELflJrQ1XESu M7EqQIm3XoaQkjvlqWmK6rexOdm0gOACwsZXIMG/x78nswfGNMopcsOlRqGY19xQY1SQ2Vyzh IlHOI/joelc23p9gihdEPm19PjnBrde32vRi0F3QhS7BXB9d6uxBapvcpEVPuT5mXbJzcga5p teFJMa6qGv0EODaG1On2pKpvZ17CsnwEvAukun8x0INVmPDE2P6jElDLm9YgIQhwWVERoE+Wm vDWqfF1kF2Y/NqVf9KGPIwYUUa+VuU08icsQG0FGiGGVuK3oTT2PJWtuqNcMM/iB7x9mRHuZa jjoJ3aKYytXfb/+AhQrsWxpzns1e8I3058vzo0mxXBi8z8b9eeFK2U603lJXOaW1jHALFkPc6 8cI8opUoxAz1HNoYRF9vkGkfAfHT2o2SO9qOCvNtrzVoPaKxL0kmA8dZGsrFQiI++QpNJBjt2 8zQre/c25Fy0Ft0Wzlh9HW9LbmzSOmD5AMw7KoH3IQ7MHCr4qlNmwCUca4Ulqs1pbxXjMsQzQ vOiHVtlmeJyV3aZupJqVBs69W6X8xISo2R869LAjBtx21GpRPX/2CGMsS6K2FkEKc8rziEhY6 CaoH4yIHYZBpb1RAukvIWAmUMDMsFa3xd39ziiYJGwWohXcsy+jDCbq1Te4wD0+3Bxx7V/0MG 6nM0vc6T9CWFIwhGKp491aPB/vF6sy5d9p033amjDPk/b2buhq92JFGmYfYbxvCIewG0HFoc5 kzNbM3h4Pb2HASG+z1rRAlBWH689aSIzweAjWHs7BvG7DB16joJIL+wPIS+4onJADQ882+Gsg cgtNtVMNNzpriNPp3lW9na8iqpJeArkD1WmmXlHd2fmWmRW7mV64m6lAL5aRC65lBhP+keD3y axK7bpoCruHiNMDhk Subject: [Buildroot] [PATCH v1] package/qt5base: disable feature-relocatable X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Joonas_Harjum=C3=A4ki?= , Julien Corjon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Reported-by: Joonas Harjumäki Signed-off-by: Peter Seiderer --- package/qt5/qt5base/qt5base.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 97315496b9..374285a825 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -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