From patchwork Wed Jul 18 03:31:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142235 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp35851ljj; Tue, 17 Jul 2018 20:32:26 -0700 (PDT) X-Received: by 2002:a63:b02:: with SMTP id 2-v6mr3966957pgl.301.1531884746165; Tue, 17 Jul 2018 20:32:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531884746; cv=none; d=google.com; s=arc-20160816; b=JoakrudwlPXGQH1O3SGoiALqjgSNAdwG9STYoaMOCyq2rvdkzbVOLcKHB912Mg58tI vacEd5UuGujthx+Lr6GQhHudr8pc5StqV1DU9HXML5VLt5ns1+J17UhxNp4xH6CZkwsl y4puyhh6hhZCqC7WonMTvBdN9J/Vnd7i48kHaeNhr8XeNWIq8lcePsfXeyvIMop30Dt0 OI96YDmFSHbWI4deE6awz1gbZXTbikK1pmVPxjyEu8WwUgMGFfZPXo0uqoDqFHQ/nIp5 tdgMftIHJtMpjSi4SkKTdzwdzGQqmq208EydQ7kdEpzc8SzNRvd60Tuf1zq6Ol6EhnS+ w0+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=GoI41pSTuYZryEGROyLm96bWW9RGbGiIzbELJ/LrB1I=; b=C+CX11of6Tr0RjPmn6wTseN8aZP0AIWqlGAHHJBNKkRSQs1O7SF6FlFhNc0kWGAnJl BNPymwYwe9EvQKfceMDzIxhjT7mt/CBjthxA0YcOPRMa1q0LO8LHjK5jXhtaQdHGV2J4 Bg7tF+vToPttMoMsTMbctJ+4ZoSaYblLBbDlKpMoQgcdS3jCADuwC7CyjwbMXQDcNtAu A3Ct5IQ6tzE5MvtjyRS6Xtpqcb4NAzxS8Kd6GblqbOa6ocLy5+PsvG3DqNNJ8KM/+Mfe WtD4ieh2UVyDe4evHj1kb2g7uAgHbQHTkfgQ4Blt9fbIsVkZBgKjOkfRfBdCWakKoHJh 7E4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N1toJZqG; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 60-v6sor812372pld.114.2018.07.17.20.32.25 for (Google Transport Security); Tue, 17 Jul 2018 20:32:26 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N1toJZqG; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GoI41pSTuYZryEGROyLm96bWW9RGbGiIzbELJ/LrB1I=; b=N1toJZqGMkbMxY9upESOkfp33aykCg7YGZ6KMeZURA8tPpdbzFf+akZFASVxrDnOar kh/Y9hTvjE2XUMUwxSQu06V41XJZO2Ejme92QyMrspeEjMMer9vQAjGo5WTjHCb/7dzw RAQzCI0Wdnl53rNj28Jgsij6LrWOcbm90tnsg= 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; bh=GoI41pSTuYZryEGROyLm96bWW9RGbGiIzbELJ/LrB1I=; b=U89VWn88ypJatK80F5AivTI3GCoERzWVdGsAdDH72lJTMz7G5Fy16vHJn9B2W1H1p6 RsYo4dZZg82ad47cZ6T5HzTN1WnIYqhIevb0YdmBwrN12PPLkMpB3B1h+z3vjqlWfkxY kyI8NpBZ2gZAcN5Rl+FWE58ecaxJ1Jps0awgmtxmi5UdWLUobyHpa3TMgARCHIRCSPcJ awhjK3yYRGxtkgBkFIGqTbK0dB3zaM4KABeQ6ZrYp/TE/iNBGBfUS98Js6gOgqMk2z4Q EJTjqK/Kl41sfoO75AvYeSknbRMc4v0IkE3Qe1facsX9Gp/KVsuuspAtWlz4qjnwaOFH ZxnA== X-Gm-Message-State: AOUpUlGt5fRRHS/FdwMANyQiMnf295o0R2WcNhArZKk+p2A6T4kViGeG CmMu5pft5SCMREiVJMvqST2ksExP X-Google-Smtp-Source: AAOMgpcOMk4dQ33+O++gj6XB92B2B6XDnzAmfJ4Clwd7kvqppkONoqLysfLmWjoD+t3i8pKn5StOjg== X-Received: by 2002:a17:902:246a:: with SMTP id m39-v6mr4192866plg.141.1531884745502; Tue, 17 Jul 2018 20:32:25 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id o26-v6sm3377044pfi.167.2018.07.17.20.32.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jul 2018 20:32:24 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Dan Willemsen , John Stultz , Rob Herring , =?utf-8?q?Tapani_P=C3=A4lli?= , =?utf-8?q?Nicolai_H=C3=A4hnle?= Subject: [RFC][PATCH] util: Android.mk: Convert implicit rules to static pattern rules Date: Tue, 17 Jul 2018 20:31:56 -0700 Message-Id: <1531884716-25770-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 From: Dan Willemsen This is a partial cherry-pick from AOSP's mesa3d tree: https://android.googlesource.com/platform/external/mesa3d/+/a88dcf769eb00a4ffc7183a0396d881a28b5a29b%5E%21/ "We're deprecating make implicit rules, preferring static pattern rules, or just regular rules." Without this patch, the freedesktop/master branch won't build in the AOSP environment, and this patch corrects that, as tested on the Dragonboard 820c. The i965 portion of the patch this is based on collided badly, and I'm not sure how to best forward port it. However, so far we don't see build issues without that portion. Comments or feedback would be appreciated! Signed-off-by: John Stultz --- src/util/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/src/util/Android.mk b/src/util/Android.mk index 9b61442..e463b63 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -71,7 +71,7 @@ $(POT): $(LOCAL_PATH)/xmlpool/t_options.h @mkdir -p $(dir $@) xgettext -L C --from-code utf-8 -o $@ $< -$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) +$(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.po): $(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) lang=$(basename $(notdir $@)); \ mkdir -p $(dir $@); \ if [ -f $< ]; then \