From patchwork Tue Jun 18 15:12:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 167167 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4352346ilk; Tue, 18 Jun 2019 08:14:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/+8+iZmiAwtS701t2FQWb2oCQmHApx4oJqoeAArMPc5j/YsLYC08QLH1ezHG9xcIPDnNO X-Received: by 2002:a63:29c2:: with SMTP id p185mr3145844pgp.216.1560870859227; Tue, 18 Jun 2019 08:14:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560870859; cv=none; d=google.com; s=arc-20160816; b=CwCJQB3cIG9Vu00D3vxOubrEB8cFFHEi3GWKD/ex6Tkqor9OQyn8JCZNzp8ylqw3kb CD4qZqVPnuitDcEsHpgzmqVyyj98spDMuDsGnDGDa5rMF7ou5Nzpxn5AEZ+W60QY+huz DFiYBaFOQs5PMOmmgMf+HmjU12s3jJeQMmCc4dO5MOkRu0IFxId+OSCnYwK30kJKOxjF GUqZwJ2DXMaKFmlappZR48O6zbd8rL7skrxujtW/yDyZnCpE6EzP8u+oA2KJQECK1gBk 8Th+B+Du2VTTQyFLmJipQtWiyY5WOxQuitV7d+yHRBcKpyQ1LcUvp5bm88HxKBw7yzex dLWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=E4KVC5Y5jdR3K3UhF2YqafUl9B2OzdXBa0sxIVGaMjw=; b=njkwWr01IUuEHY23sY03oFezQzhUWTuMMR9HLCJv40Tnjzcius57jERtYAUPpm7mQe PDyC1HvWldpVqLSA4o4jrn5IQxQcoOLN4ObDcZTG1hoj9n8NFVmE2mgSFmifcyXBAPE8 f7pxTqs8Dh8ZJ3TDZWVUU9f6tPA7r6Ix6j/wolYMvHrpRaDWuYOVp9yoozjGy9SQ6Bpx LcMuFW+1IjtYOUA872wTmnNskXzEIz9I7Av/KgkEjewx4K4XfpD2timk/0hDU5jWH4vk hO/yJ7BQ3RtX5OnOXEOEh7CDv/WQE0YVbmZCkQf8rqug79cRiISv4t9voQ9oqmxqSgtS 78hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=1yPW0u9B; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z14si432464pgc.581.2019.06.18.08.14.18; Tue, 18 Jun 2019 08:14:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=1yPW0u9B; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D817A7E950; Tue, 18 Jun 2019 15:14:13 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mail.openembedded.org (Postfix) with ESMTP id E00E46BE2A for ; Tue, 18 Jun 2019 15:12:31 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id n4so14382681wrw.13 for ; Tue, 18 Jun 2019 08:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=OIANtHcpitxcSR0FBs9ULKmE+YENv2ws3yKckOGzAPU=; b=1yPW0u9Bz3kg04+lKJfCuIxranIGKzEmo2ZejrDs//YECKGmn5s0VgVI5XUyIV5Rev 72SGBqfK8JUl9a6J76nPHKs18RQazB3v5EwhTwgqUDKn6VV4FP7eXo263fsGE5ZgXEJG t/vKdZmWCU6AVwzGRoFL9P+jcizyMdDTQvy3daGP4dYM7BXNAFpRwJNnXSru4hWzwkZC 8LeQiubq2fITBLBQBgqOe2QZhXbSL9OqnjSgRR9cDNvQ0R6lkV8VhS4mk0+PWaK9opXt zVbdYtyo4rKHLJrq5hL0AoRinlg1DVQdqkaZi3Z1XgQ5+UMiOC03w1HN+dzwMQXa2Wnd /SUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=OIANtHcpitxcSR0FBs9ULKmE+YENv2ws3yKckOGzAPU=; b=SZzKgg1ttKQk30eASFFbEOZ+4Bj+ae0AIZeAuMDWjDd36iTc2MJmlZejYkITCowUIG /Jay5gJQ2S81wr0Kuyhe0ni98qCsrZHMDJ0FDBxsPr7Zex/xcU2Ib+EADNzxmWZqyWFJ 07j+1Iory07xebDojQ1iwiJD32x38CeFAT8EXcUzcrtkIQ7lYn4szABhYwsbInulhuuo +9CxiKnUmdpn8mmlZm5XnZtLnojnrvHjR1wtbhx9iCbUXcnK+Zdf3/WsK/ajrpLnNiXv bg74Pf+fSPrzRVkHEgvyKG8zVnFx3HfFJWWzFQoX8K/h046BVO/9CJp6hwbD6zgXy69s PSWQ== X-Gm-Message-State: APjAAAU+bc6ubHZJprEfJNav4VyOC6Fz1ibMzivrmyPsCzKJ71RfGvSN P5LdlDrKRaUpjOH+E1GofKmTLX3fn0g= X-Received: by 2002:a5d:6a05:: with SMTP id m5mr28888496wru.161.1560870752242; Tue, 18 Jun 2019 08:12:32 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id g17sm13626919wrm.7.2019.06.18.08.12.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jun 2019 08:12:31 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 18 Jun 2019 16:12:29 +0100 Message-Id: <20190618151229.4786-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] glib-2.0: fix host path appearing in gsocketclient-slow test script X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Glib's build looks for the 'env' binary and embeds that path into the test script, but thanks to hosttools this is /path/to/tmpdir/hosttools/env. Fix this by hardcoding the path to env in the cross file. Also as the cross file is only used in target builds only add it to SRC_URI for target builds, so that changes to the cross file don't cause a rebuild of glib-2.0-native. Signed-off-by: Ross Burton --- meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross | 3 +++ meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross index 8420f9874e1..b5df4007275 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross @@ -4,3 +4,6 @@ have_c99_snprintf = true have_unix98_printf = true va_val_copy = true growing_stack = false + +[binaries] +env = "/usr/bin/env" diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb index f4ade098ef1..bb77294e1e0 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb @@ -16,10 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ - file://glib-meson.cross \ " SRC_URI_append_class-native = " file://relocate-modules.patch" +SRC_URI_append_class-target = " file://glib-meson.cross" SRC_URI[md5sum] = "112a850caa8d2c21e24d4c9844e8b1fe" SRC_URI[sha256sum] = "04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9"