From patchwork Tue Jul 24 23:21:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142835 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141198ljj; Tue, 24 Jul 2018 16:21:50 -0700 (PDT) X-Received: by 2002:a62:9f85:: with SMTP id v5-v6mr19632094pfk.27.1532474510115; Tue, 24 Jul 2018 16:21:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474510; cv=none; d=google.com; s=arc-20160816; b=UHhf8gjYn13MU9Rjl7z2A7mnCPkLLXek5hpsSU+pOgxgCVhhFLOPfYeLGn+mWU81PZ 75iQKcJ6nLtM1W1naoW9Bn0jabGA4iZ6cvtB5SMYRPaSzfWBvIRqZTw4Lf7oYMCLATUY /C1MNm+7O685+Iy7ez6bIyRdeK/869DONgybc2l7co8Ay85GUIG2a56j/fmBiqRF7XpA sNCELq1hwl3Sk20bpjy9fJF4hwCZuB4kFk7dlORADHoUC2RCtaVrR+KUV7fFHqc+ILh0 rSfd51mvOIK1NyUPsd1CwgMueW8kIMWgAE3ACzMh/6zEoAwhONY/ny4StYp2J+C6HzPp cKlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=tKpkTpFDlz9CNiJWQVe4eEGeS8xRR/Jmy6Dl6ph979z/95b1foVf/fz4d3YHIF1OSv An03AEb1gy8dVye4DrZVQHz35kzASVnviykPadIBW9muPCeZUPaKKjYMcQTrhWbTbkpg qpfqVTtt8IWDmegVWCOBE3HeE0hQPG4BDJi5UYWwvZ2DYLgaKxlG95iaLJanh4Ynd87k EhuchxU6k2ehq+v9x53T9NAORFRELXsk5TG5aYag64NR+IDcQgMmMwwB6ueVj5whMfHl 0TQwUnOkDs0W0NQkbSKUI4tJcIU79H+VLjM9/vI90q1Z9lP7M6XJnm2t1Z5EMM6E3b+Z Okig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lob5p88O; 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 q25-v6sor3679857pfg.46.2018.07.24.16.21.49 for (Google Transport Security); Tue, 24 Jul 2018 16:21:50 -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=Lob5p88O; 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:in-reply-to:references; bh=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=Lob5p88OwiNVXHa6C5qgPmV4M/dukJHrXFNMg3azGAW10KdzVu2iYlXrLyZXCJGDrN Le361agu1FApFNj1OXr0/M7ZfLLkWqd6G49iMLXSd/Fa22+v2b+vQdiAAaNCqAsdHfPb tGfQyqeZYwMwYnDaypVhdwL0u5fNahcXpHKMo= 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:in-reply-to :references; bh=L+f4D2+B/QKVWNMK7t1LCyDlgmwnb8sIk/0mNlhHDW8=; b=O9ofK1Q8h5I2w3cSRTTpLhU42bkO1vvG99nf0UGs/Im7XLV4Q2AUMi/MNvqO8SQ2Gk Hq9TlRHG0kC0UPsiaKqy4qmRtQijByPlwrgzjrVQhNRobUP2zzEMPKF3vJVuPcRapWnV 4HmCJlpzMqCQOsYJaTNgarmE9fhdWQoR/DpWaQDSAxW3c3OFOj+lCGGBiSBJEpw+zZRs 3SplTSlhH9F4PnqSDBcUo7R+qNM1jl+TjFM6c9z8jpm9l9KO2qaJXx+/VJ7bRcuSP8M0 F51l4OgXO6I2XUpDhBDdwh2B2wTqS25E8nz6PsK+f98h6A1wLFof2GKNzURkqcNzpxvH UUBQ== X-Gm-Message-State: AOUpUlGIGraEoH0eIPHuVEoCCZOL+8qAwK3CaATcY8YWp+KUpn/Y5pk1 t2pymrRJ1Qj11LQcsEFSJV1tm13PZam9RQ== X-Google-Smtp-Source: AAOMgpfpvzMEo58h0X2VwKjYRlihV5NhP8yC9GVV2kI0B4hkuBvx3yVpPC32A3QBaDB2YJMUF8/48w== X-Received: by 2002:a62:1e81:: with SMTP id e123-v6mr19867650pfe.24.1532474509599; Tue, 24 Jul 2018 16:21:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:48 -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: [RFC][PATCH 1/5] util: Android.mk: Convert implicit rules to static pattern rules Date: Tue, 24 Jul 2018 16:21:38 -0700 Message-Id: <1532474502-17657-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> 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! Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark 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 \