From patchwork Sat Sep 28 20:04:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1168922 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fzBUSGpf"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46gflF3qcmz9s7T for ; Sun, 29 Sep 2019 06:04:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 059CA87133; Sat, 28 Sep 2019 20:04:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZWPYwiAW+lhz; Sat, 28 Sep 2019 20:04:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 621C486D41; Sat, 28 Sep 2019 20:04:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 732401BF4E7 for ; Sat, 28 Sep 2019 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6CFD9203E8 for ; Sat, 28 Sep 2019 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BFSghKeU13Gk for ; Sat, 28 Sep 2019 20:04:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id BE2EE203DF for ; Sat, 28 Sep 2019 20:04:35 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id f22so8743675wmc.2 for ; Sat, 28 Sep 2019 13:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NH042uR8AsBB6goDVywFU4GmQ3+a097d/CnVPTp0JEY=; b=fzBUSGpf/mKnyBgczSJI4a0Aro/8SvEf479HgNMVrwspRNTgsU3SKyi10XCh4OIQcH jIfr8/ICiJmrA677wH30fKzi0FU2pOxFseBlqPajaOWjp+zmBT1Dbq3tQWLHUYKN53xC cRVAiTl/SRtlFogfQjgtQYcYo7riaMKQD9c7rSK/1dNFE+i/sUps3G4V3aypNSWUjK9F hP45b321m7hSCyX/w8jREMOXUcuWYzSKl5LY1pCxSMCFyomIvX/lmC/LB6Gbp6nRGZmY a/uA9COQQC7hrqssJFw3qb1mnIX5NWvPlkwRmGxwQRmZooAKR2JuVNySHOhsEQVdyX3z usLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NH042uR8AsBB6goDVywFU4GmQ3+a097d/CnVPTp0JEY=; b=A4FvWFPgDoHKh0Dp5s1bj4UWZoOCZfFE1Etnb1q8b1heetRWy2Q1VD1HUB7CxgOZ8C CQZdH3JAERHqEoGpY2wXfaeFN4aGKwNZ/FsuPWRgQQse81tNhpiV0g7YCqY++DG1l8kV YvF6kMc8sHDok2qqCBbOnEKf6YZL7R99MyX/EGr9kGLRy9O6P1ibreDOMWDgjeyzt5Gz ya6v7xMKGQ+qRwIE0kZzH8LwiWq8qLks5XytxBLLkcfUgpCQN2CsUhQ4E89M3Dsh6Wqz C0VCane71ZcvJgt3DuxSHAdbwn8IEuA945X7wkrOOI8/pURvOViGI0l9uPLGesZuQyvH Yb2g== X-Gm-Message-State: APjAAAVBlwQGXgWplcaSO6u5mA3qkJFv0jzds5A2L31rn9rcPe7qyQV6 Q/goh9eLlzE42j6tlpZ+1KH9+xC1 X-Google-Smtp-Source: APXvYqwmapZDI+CL7GbNZidFiCq9G9sED/YK+4Rmfm2AfFhju6aaJQuMJNFTyM3IE+RgDfp9KGWgbQ== X-Received: by 2002:a7b:c112:: with SMTP id w18mr12279115wmi.88.1569701074094; Sat, 28 Sep 2019 13:04:34 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb19:8b51:cb00:615b:ae:d582:4937]) by smtp.gmail.com with ESMTPSA id e9sm24390076wme.3.2019.09.28.13.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Sep 2019 13:04:33 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 28 Sep 2019 22:04:31 +0200 Message-Id: <71bd376fbcc68a2171acdc72d9bfddd0e60bcefd.1569701061.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/mesa3d: add llvm-config to meson [binaries] 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: Bernd Kuhls , Romain Naour , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The meson buildsystem does not honour environment variables; instead, it insists that path to programs be passed in the [binaries] section of the cross-compilation.conf. So, that is what we must do to pass the path to llvm-config. Note that, LLVM_CONFIG does exist in the mesa3d source code, but it is limited to the Scons buildsystem, and is also a leftover from when mesa3d was using the autotools. It has never worked with the meson buildsystem. Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Bernd Kuhls Reviewed-by: Romain Naour Tested-by: Romain Naour --- package/mesa3d/mesa3d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b47c6b9b2e..205bf96285 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -33,7 +33,7 @@ MESA3D_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_ENV += LLVM_CONFIG=$(STAGING_DIR)/usr/bin/llvm-config +MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config