From patchwork Tue Sep 11 09:37:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146427 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3432652ljw; Tue, 11 Sep 2018 02:37:43 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbXvEmcRZJbQ/haVfy0GhTdBsXfPWTONXxuzSYBtmCOT7HKR34k/iueiLhysFc2KwQdGFXE X-Received: by 2002:a17:902:724c:: with SMTP id c12-v6mr25885919pll.326.1536658663131; Tue, 11 Sep 2018 02:37:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536658663; cv=none; d=google.com; s=arc-20160816; b=HMgnBFO3eueRXvFR5fK71IuiI4Cl+/HJZnw0FxCyFRVSHyNjwcCoH9/3wjuPi9yl0q ttm+RhKc0eCMaZUNxvyz3nvCf1djMu3K3uZxnDjxt9hejU97RU0z13omXtWsxXxPprlQ irq99JIoNcAeHT4R+8iEG2DL8utJNGTu5I7A5rSFzh4SuSGXsP5gObY/6VvCxiNXbuhr OS1P0NhKqAfKzIXaDMMq9To242kpLTKVv9dJARPNsJI8fvtpRflK99hZq4XhHe08rbis SlZs3FXXr+0YFUGCe9+qpYtP9aLO/j1KbEeZ0QfPECWi28EoWnnF4YsmF02neSw5cgB8 xrxg== 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=4QFrH1L+tsE63ehozlXEbtaWtuztU0Lybqkfz3rT8Ec=; b=GQRhmvKj+ZeGNj3aD/bRpZ7u2UCKXkOJxmxLOzKzkkcpQROxSv6929dNihSwlg2K55 UowP80DbEuQ7wwVwPtMqGtiFanywY+LgNn+oABpwd8rkb3WxU08BJYb8Ub2G72inW3Kc 35DEGNoS18ZTy2VByhdYOjBDO0v1WVmvybL3wyxLXyteq8TLcIxX1iK6ILOiQe8pNmQo 7dsR4mej3nAlOJS4Q0fdE4wr4GSKUkYdMDGDTOuUksbfIhr9GlGghtE3kikDmQVZ9U8Q QQubz3Vn/5wm7AFlLo1epA7crlj/6Zwl2RJOh8g9bMwLFnxrURso7vFa4zqRP97a7nlO bWYA== 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="xGqg/2Do"; 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 f90-v6si9354966plb.504.2018.09.11.02.37.42; Tue, 11 Sep 2018 02:37:43 -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="xGqg/2Do"; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9C1AD7983E; Tue, 11 Sep 2018 09:37:39 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id 5A1C079034 for ; Tue, 11 Sep 2018 09:37:38 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id v16-v6so25028290wro.11 for ; Tue, 11 Sep 2018 02:37:39 -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=Czp3Ye0uUMPCqNoFA3QxxPVDQPsxUJXhbs7oA/Kn19E=; b=xGqg/2DoSmRh3QTJJC4LvfcsdLaQYuXB76tdLD6UUHFHVDSWDbTLPYoYcXTS4Ma8DT Sx+r4nJFzDoOxOMCRCHbtf4WxW4EKvQffj7hJVwKuNrHU0HfPdWPIGG5kawhKXjZ3UEw VzBSdqBaha9OsslvMQNLCMsgYSFilxiDcNKTWOHgvkFO+5wl8QHxvhkPbRMumu8iNcyJ V4IWhRe3nTzToJHmd2vpdO6JnZkCL7ef7kWIek4KYUyWQpyXxRs+Ju1Pwm9bIUPknZ2r 9h7/ExsbSe0tuGzDkp5WnVANv3Uj3E/DugPl1Q2rThiR1tGdez+lrxI4aJ1JoO+c4NUj rI8w== 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=Czp3Ye0uUMPCqNoFA3QxxPVDQPsxUJXhbs7oA/Kn19E=; b=Gb6Om9jsoOHxMlWtWV5MLNW8ydTIJTUU8qyLtMuofxChE3J9zYy31Shc2VVtCMHgYc 7ioAarYNg4AIYmkaR7p0t6Vhw3cyo4jEIZ6T6BN8LWdXy6FcL7os/WtL+p9hUcJDtSEA 6CxXVMScMOs0Pt9BUaHGTjRbNxTRKjIOnWyZ5pbqhm9iUEEE4iasxPTWHzOvDA/pu1Ue ySCN/e8pmkK0AXahJWY1aLgRQzCRL7gdMXq7L3Olvv2XskAC8akWsVz3GkaWRgQPGzEg n4IrD/PPeg6KVzbFRn2GuI6p+K3X1aGZV8NgZ2rVZp7udW+8vg9jmBsKLypdiMRL6vzY Abtg== X-Gm-Message-State: APzg51C5HcggjfIf6WkuhGmPAJ2RShW/85fv2vyj8gzKtKtubAwMhFND rVqkmZ29lKaH0tDOQjs8/7x8MZhWLfc= X-Received: by 2002:adf:fd12:: with SMTP id e18-v6mr18839261wrr.280.1536658658554; Tue, 11 Sep 2018 02:37:38 -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 g7-v6sm15845710wrw.30.2018.09.11.02.37.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 02:37:37 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 11 Sep 2018 10:37:36 +0100 Message-Id: <20180911093736.5271-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] harfbuzz: remove stale pkg.m4 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 harfbuzz shipped an old pkg.m4 which overruled the pkg.m4 from the sysroot. This is now fixed upstream, but until another release is made delete it from the source tree. Signed-off-by: Ross Burton --- meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 ++++++ 1 file changed, 6 insertions(+) -- 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-graphics/harfbuzz/harfbuzz_1.8.8.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb index f41db989c70..b904d935317 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb @@ -27,6 +27,12 @@ EXTRA_OECONF = " \ --without-graphite2 \ " +do_configure_prepend() { + # This is ancient and can get used instead of the patched one we ship, + # so delete it. In 1.8.9 this should be removed upstream. + rm -f ${S}/m4/pkg.m4 +} + PACKAGES =+ "${PN}-icu ${PN}-icu-dev" LEAD_SONAME = "libharfbuzz.so"