From patchwork Thu Jul 26 18:28:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142992 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778352ljj; Thu, 26 Jul 2018 11:28:54 -0700 (PDT) X-Received: by 2002:a63:4e22:: with SMTP id c34-v6mr3015765pgb.6.1532629733971; Thu, 26 Jul 2018 11:28:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629733; cv=none; d=google.com; s=arc-20160816; b=mN92G4hzzB5po0tSEFPzcpujMg0YW4/CoYci1bS/SfmwIxNQ9k/fbvGEDpFzPjImbF Kwk9n6r/jLrrAPUXBPX32BitOsWOnnnuuukTcvdwkOH0FXsPH40T6BbwtFdn4ZpvwLUB B3ij6QCU+DstiZ78iF4O0SPDpSIX76l+TB68A+vyAWTv9+wdfO2Vw8LPfOsyYG5HukX2 q9Bu8qTR2FjBoykM79FA4J2y6SuKeXP3N2hhzC1BuRIBuj9eJxglIOtAep0nWpZNNssh WZ3QAbSCLmSgjR8MnzGF6EhTnei3DTA8hau6ZVeJHExV8wwdiAmkMf2sbuaWlSjv0Owq 8v2w== 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=hG7RQMRG73zXHSspo+tNxSQ9xuV0PBZG12QayCOvE7BmVlVF1CWvV2T0UxbUUif8Vr yGJGlvuInpdk050tpEBDE/UNn3hGIJDrHyXVj445bPErBtzu+brqVsSMQC1yINeDNpwp mrni3f83Dvo0x+ZyKUTD1PTQCDyLNWtDfa9yisRzdLLwQq2rFmL+dJSuaTt0nfRF6+sC DjrHJpe7h10gWUKZPXzLHFhrI6znvCt0OLf4g0fBe6aDFKsTupvDIy9TGn0/crw0GXgt 7T7cmfWtKceSijuvQ9FRyEvm+UyCUOADDnWM2RTrt1gBSuHNgGgSU9ZoREVw12nXFFTg Cpkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZRghJOEe; 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 a12-v6sor518070pgg.157.2018.07.26.11.28.53 for (Google Transport Security); Thu, 26 Jul 2018 11:28:53 -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=ZRghJOEe; 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=ZRghJOEe7gy8LBUXIdkQpLfRZkZzc74/DyEdmFe+QgFheDwyqjB8Onj0dd6Ogxs7I/ 2qPUirt0h8h9xbzQZJnAm9Cab70h3SQk566P7u0A9F2TFxTv/psrA8sR7pOPs4bqJKS9 eNGz/821DOjIFKUDYou/aBWox7++d27r4f2dQ= 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=o50WYTF7MZZlOCzQLlRFE0TJ61a3dmrhpSU3Pr38S+0=; b=HQpqrwdlqHQqnIYf+2NVxhznPaol/nDlDK6ifPTyTLChWl3fWZvvbvF17r+kqwBpuQ 9u6O34GK+SePej6upeFyxjp055/Bx8eus2wEE05wzf2EAh2XagPCMVuCmIw5os/9py9w 6UxnAsH46hVt2DFCzoR9q+lZktB/3q3Ka0V8c1+yF6mN0KiwaejAH+B7jNx4rihZgLdr LwXmh6kJRNrFwjx4wHZeTu3kq9D5GWbCNbFg/l1FS7slLJcAZAsKLvSCZhjJEMBiii8/ 66oD8qih3V77thIQPtS/IALU5HcUDY7qpLo8UUAX610UsNcP5LWyYVPMVRnn7vZwX1uC Y2Gg== X-Gm-Message-State: AOUpUlG0LoyD2bntUmviHhjbZ7Uk1ynciY3N4KNdUNyKpLHn5iJjcjGz m1NuccF0T13okUk9eOy/ec6lUGtk X-Google-Smtp-Source: AAOMgpdu3KYm5FWhi83sRhRABs/zw49Cs+aOniqGfOpCzbwWW6tDw12DVor9MbRLvwmORfX5wFUL1g== X-Received: by 2002:a63:6b86:: with SMTP id g128-v6mr3047899pgc.344.1532629733416; Thu, 26 Jul 2018 11:28:53 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:52 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Dan Willemsen , Rob Herring , Alistair Strachan , Marissa Wall , Sumit Semwal , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 1/3 v2] util: Android.mk: Convert implicit rules to static pattern rules Date: Thu, 26 Jul 2018 11:28:44 -0700 Message-Id: <1532629726-17441-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. Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov 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 \