From patchwork Wed Mar 11 19:19:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Mazovetskiy X-Patchwork-Id: 1253165 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gh20Iyti; 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 48d1xM4Tb3z9sPJ for ; Thu, 12 Mar 2020 06:19:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BE284869C4; Wed, 11 Mar 2020 19:19:47 +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 hsIHY0xCoyYK; Wed, 11 Mar 2020 19:19:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 679D9888C9; Wed, 11 Mar 2020 19:19:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id ADCB81BF381 for ; Wed, 11 Mar 2020 19:19:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A9C448836E for ; Wed, 11 Mar 2020 19:19:44 +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 aQ8VTK1v80d4 for ; Wed, 11 Mar 2020 19:19:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 47E8687532 for ; Wed, 11 Mar 2020 19:19:44 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id v9so4123163wrf.10 for ; Wed, 11 Mar 2020 12:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tAbamZZGnTwUkRmwpcFKOX0GkRpEP+eXf97MJy5QSoo=; b=gh20Iytifqqv663PS0TqVULA1v5XrEnTT/a02sNwS5WOBgd+YY05UgW0hqAJPJ838n WEJDlfIAVmKZyRx/EIzZtimtJ7Mca+yLPdiyJ8lUHM+fV3t0Ld3SvfLqJ7lca+xqnTz/ 5L05cZXGvfpj0xHCdqCDiftkaXp2xDdBdU54GpsdIB5QjjraAPK4G7Q3/TAlYjAE9BCJ moGPQZfb8axcL8ebuGM6/9P/CQNBi3dgp0SSHkNa4J+yRyYk01XO6oedHLURLvvjRPZq Jt0XtDaC+zxmgujQ3xa2JgJUVVqXXUJX21avAmZuwko9G7N9DOQo9APfHl3DPrskCpzS To1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tAbamZZGnTwUkRmwpcFKOX0GkRpEP+eXf97MJy5QSoo=; b=D4bPM9hU7nT97CAioZG94beI6Yecn3FcPO5jQ/kByFr3RdcqHA/yfVVMH0HIwYBgHQ I/aEuP3belj2YgcN9ohXTu2Btg00G2XegkMvfx8o6GGFPXW/YdQ9OtiJ5yZp9XLB3kJ4 f5ybotLkoOd/yhsi2SESqI23bgxGzJcrFgKKWx5ZlLnF5BGEPwFPalZMHP1159UH72DH K3LjGyTzSEs2Ej6VaQkDeSlxCwMcQW3SmfGlx77sPJljd27t8zD1g6jVE9QWIGeywZRV +0GxggBDD0ebvBQHSMQFhw4eBhsJmd3impB+VZrUqeZI7gY/TNPaXNTZKxaLDH88puEE +bEw== X-Gm-Message-State: ANhLgQ36lYkFZFHPgriwsg9rE9PNG0kN983w7dLGu1q1zV7LSRYM0Re3 sQOxJIAbY6DgTNthdV1rncH1Y1sXkUQ= X-Google-Smtp-Source: ADFU+vtkuSnjZjK0iQnS/+rfdMReZwomWmqFeIgF4Br7wVs6eU7vO5eWNmdpxPxdR0LQ3520SD4R8g== X-Received: by 2002:adf:f708:: with SMTP id r8mr5937149wrp.221.1583954382362; Wed, 11 Mar 2020 12:19:42 -0700 (PDT) Received: from localhost (cpc76906-dals22-2-0-cust502.20-2.cable.virginm.net. [81.106.81.247]) by smtp.gmail.com with ESMTPSA id f207sm10243517wme.9.2020.03.11.12.19.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 12:19:41 -0700 (PDT) From: Gleb Mazovetskiy To: buildroot@buildroot.org Date: Wed, 11 Mar 2020 19:19:39 +0000 Message-Id: <20200311191939.16660-1-glex.spb@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200311105930.21564-1-glex.spb@gmail.com> References: <20200311105930.21564-1-glex.spb@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/pkg-meson.mk: Fix cross-compilation.conf 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: Eric Le Bihan , Gleb Mazovetskiy , Peter Seiderer Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" $$(STAGING_DIR) -> $(STAGING_DIR) in PKG_MESON_INSTALL_CROSS_CONF. $$ resulted in `$(STAGING_DIR)` in the file instead of the expanded value. Note that this change only affects the etc config at: host/etc/meson/cross-compilation.conf Per-package cross-compilation.conf files are already correct. Reviewed-by: Peter Seiderer Signed-off-by: Gleb Mazovetskiy --- package/pkg-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 642b715938..416129f6fe 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -193,7 +193,7 @@ define PKG_MESON_INSTALL_CROSS_CONF -e 's%@TARGET_LDFLAGS@%$(call make-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@TARGET_CXXFLAGS@%$(call make-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CFLAGS@%g' \ -e 's%@HOST_DIR@%$(HOST_DIR)%g' \ - -e 's%@STAGING_DIR@%$$(STAGING_DIR)%g' \ + -e 's%@STAGING_DIR@%$(STAGING_DIR)%g' \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in sed -e 's%@PKG_TARGET_CFLAGS@%%g' \