From patchwork Sat Dec 30 09:56:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 854077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dp/3POwB"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z7zPv4nTgz9s7g for ; Sat, 30 Dec 2017 20:56:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3EF698672E; Sat, 30 Dec 2017 09:56:48 +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 ncIGHrfzFt39; Sat, 30 Dec 2017 09:56:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 222CC85EC0; Sat, 30 Dec 2017 09:56:47 +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 990491C0B30 for ; Sat, 30 Dec 2017 09:56:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 958ED869AD for ; Sat, 30 Dec 2017 09:56:45 +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 9w3n9FNUZSyC for ; Sat, 30 Dec 2017 09:56:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7726186712 for ; Sat, 30 Dec 2017 09:56:44 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 36so10013422wrh.1 for ; Sat, 30 Dec 2017 01:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=31VK3Q+D7iuHeGuJp4CiGsKIaPOPEgT1gKnA4s5/WKk=; b=Dp/3POwBwgzqmrx/5diDMxpHixff22lLy/sKbfn/fq+Kxp4l+osgYdcKxK7N+S/Llv ginJEtPZML4BS/5dfgW0bJ3996J1aDuLxPFEt5EbhkZ7a1lvhPXDn0wacSUXXfzUSpR3 0+3Q0fdqXF5TTL3L6fw9coLRHj0j+3FNwp2B1wZHUs720B3re6BPAZplsG7UgFskSG// w5m7u3Qx2IKtY6hR6bofsn2Ehd4jhYDMZGZzRnNxI6qwa4HOvZqx2jz5G7ofXfKHZmOT aH0ynBgY1q0/yn2QboIAooF5xi2rO8MgONa9Ur3JViF2VFpt79LwsK1jpgVaDsA9ii1K 7GHg== 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; bh=31VK3Q+D7iuHeGuJp4CiGsKIaPOPEgT1gKnA4s5/WKk=; b=NNF1satBffnc7MaKiHbZc/6/wbJAH5Sbx/hEBqqOFDt6Gaw6LLw2S95pXQk/hWZg7e tC3rqOaO9yjcxP3UYKuIQt/emRy90S8Kz5t3rQsft4fUxi/rfdq4OIgEfheSva4A2eWG irEYOQnVR3p3vil6LHxZ3OP0uhlwNWZl9MNc4qNnsa5geKDM95X4lyNpTi8E5O0EzjfF 3ymtFZecUXYS6U5KklWRrjLUv9KFbm6stXZF8SygNnsbNFMAY7WJsSszzeU1wPVc4nnR S01DDwglqrSSjrcJuNXQNE0ovbLwIDRem2VF4K9ppAl/gzGdrVRf3QmdXJrvYpX9YVtm OFKQ== X-Gm-Message-State: AKGB3mK54a+kTkPty9x7fY0miOG5REDk+yf9W/mgd7aYoGB+q7gTXjQn hB6Nq3+AuEkK3dhJg65Uv0r+kw== X-Google-Smtp-Source: ACJfBos4cZq0aaS0kFcOCcdv0F/RGkV+3WzFCIHXJHtd2yRZcQub4e+/TN7amhrPmLnISYs6PXjHPg== X-Received: by 10.223.187.7 with SMTP id r7mr30506263wrg.233.1514627802609; Sat, 30 Dec 2017 01:56:42 -0800 (PST) Received: from localhost.localdomain (2a01cb08861073005cc8117c68db0cd3.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:5cc8:117c:68db:cd3]) by smtp.gmail.com with ESMTPSA id t4sm16488060wmt.9.2017.12.30.01.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Dec 2017 01:56:40 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 30 Dec 2017 10:56:35 +0100 Message-Id: <20171230095635.18123-1-yann.morin.1998@free.fr> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCHv2] package/meson: fix malformed cross-compilation.conf.in X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett , Thomas Petazzoni , "Yann E. MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, meson will set the c_link_args and the cpp_link_args to the value of TARGET_LDFLAGS, even when it's not defined. This creates a malformed array ["",] which will break any package building using meson/ninja. We fix that by using an empty replacement when the corresponding values are empty. Reported-by: Adam Duskett Signed-off-by: Adam Duskett [yann.morin.1998@free.fr: alternate implementation, suggested by Thomas] Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Tested-by: Adam Duskett aduskett@gmail.com --- package/meson/meson.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 55ce84da07..d55c3c7c00 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -16,15 +16,19 @@ HOST_MESON_NEEDS_HOST_PYTHON = python3 HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN)) HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU)) +HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`) +HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`) +HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`) + define HOST_MESON_INSTALL_CROSS_CONF mkdir -p $(HOST_DIR)/etc/meson sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \ -e "s%@TARGET_ARCH@%$(ARCH)%g" \ -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \ -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \ - -e "s%@TARGET_CFLAGS@%`printf '"%s", ' $(TARGET_CFLAGS)`%g" \ - -e "s%@TARGET_LDFLAGS@%`printf '"%s", ' $(TARGET_LDFLAGS)`%g" \ - -e "s%@TARGET_CXXFLAGS@%`printf '"%s", ' $(TARGET_CXXFLAGS)`%g" \ + -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \ + -e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)%g" \ + -e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)%g" \ -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \ > $(HOST_DIR)/etc/meson/cross-compilation.conf