From patchwork Wed Jun 23 08:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1495984 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=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G8xgn53P0z9sVm for ; Wed, 23 Jun 2021 18:46:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B5F75835B1; Wed, 23 Jun 2021 08:46:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dpMxYIcIufGQ; Wed, 23 Jun 2021 08:46:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 214DB834F7; Wed, 23 Jun 2021 08:46:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 57FEA1BF2BC for ; Wed, 23 Jun 2021 08:45:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 55314834F7 for ; Wed, 23 Jun 2021 08:45:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PQtu24eSh0ka for ; Wed, 23 Jun 2021 08:45:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from dd5108.kasserver.com (dd5108.kasserver.com [85.13.130.47]) by smtp1.osuosl.org (Postfix) with ESMTPS id 343C08341E for ; Wed, 23 Jun 2021 08:45:53 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21ba9c9.dynamic.kabel-deutschland.de [178.27.169.201]) by dd5108.kasserver.com (Postfix) with ESMTPA id C9506B9014EF; Wed, 23 Jun 2021 10:39:34 +0200 (CEST) From: Andreas Naumann To: buildroot@buildroot.org Date: Wed, 23 Jun 2021 10:39:27 +0200 Message-Id: <20210623083927.8278-1-anaumann@ultratronik.de> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] qt5: Fix sporadic build failure during top-level parallel build 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: Peter Seiderer , Julien Corjon , Andreas Naumann Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When using top level parallel build, independent qt5 packages may be built in parallel. Because of their staging dirs being hardlinked, they all use the same qt.conf file to manipulate during configure, while another qt5 package might already use it. This leads to weird build failures because the folders qmake is using are diverted in erratic ways. Fix this by actually recreating a non-shared qt.conf file for every package. Signed-off-by: Andreas Naumann --- package/qt5/qt5.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index db6ccd2b42..3ffb7b0063 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -15,6 +15,7 @@ include $(sort $(wildcard package/qt5/*/*.mk)) # compiled into the Qt library. We need it to make "qmake" relocatable and # tweak the per-package install pathes define QT5_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf endef