From patchwork Wed Aug 1 23:20:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 143320 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458932ljj; Wed, 1 Aug 2018 16:20:45 -0700 (PDT) X-Received: by 2002:a62:2e02:: with SMTP id u2-v6mr381701pfu.134.1533165645448; Wed, 01 Aug 2018 16:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165645; cv=none; d=google.com; s=arc-20160816; b=g0FwPOZUuXVHJdlt6/BVT6pjJk/cFiw/udmHVhtByla6THCZTXhP+v+hfEkFFEQ5OY UXeff5qz16x8EO9tD1CLJtkAjpCzwPePXxU0Mx5eJXak6OByw06UtQUmaiOWogKLkpOA ELjB5Ja7zBSNYOW47loKMB0/ZmE67xDuvrP1bQSCLaHPHayI1E6cPB1gU/39RBZVxSUS S5G1YATwcJVfCXRll6yWkzZWpO/Jzp2iXW/QMGzejdjDIxRPjoEBnbkEMn5mQobHqcYf YqDceR6BS5trdEnAsZFdRm/nsun/kcnjMiURURyQwXI3LSyzR0GbdiMyGuuEGto1oD9R qxtA== 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=WPmADh9aKcGfeBTYHqm/POwYOTPBqtqioOmLWDYMwlPGW/wItqZBuJR6eQqe880FJR sTnda1LgT6rjsS0TuK4xRogfHFr5Cy3z3ns6oLKSZJbGtTYS8/OlvX5oViHa0Z2691Fh onWC8HGBRyLIrOG50+a2QqgCf/tI6rLUqTij93uWAD0kaDEGSaa/I9pdno7X2rv3XB+C 90z4E8JQL06+O5HC1TWICSCoEWnJgTJk+1zIn+wo0asCTpa153NEmXOp62B7F+Bfr4DG WItAYckohbOO+oZ8s/Ahk+JvQ6PsDQpgEvz1X4Qarr7kPzN6Icdihb4gKnj4GlpYdsLH mTNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=coI8tuLF; 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 k26-v6sor82416pgn.77.2018.08.01.16.20.45 for (Google Transport Security); Wed, 01 Aug 2018 16:20:45 -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=coI8tuLF; 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=coI8tuLF2cgK+uzPOrohBNRpbSZvt7YjbepGQgsezZikoA6U4+dlO/wgOWI1ecs9LP 1KZzy+uOnXOuzx6CCbBw1bPS1q3Jbw0R66QSCEz45efEU6+Ux4sJTu31rYUUJXOhbzkD jNfnvHzX+9PYYyubUhLRvE8va3v43Ij/2jlFw= 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=58VG4pcbIDKcPyGsotV3v+3INPzBQPEgXYWx/0Q5teE=; b=Nlm/3ZZ797XAJMF2kKYrUj7PmrBaj4dyfKDHVZ6iQZVZPexwWmtdZM04oU/+aG3QE9 VahzsArMGrE3Q3+fwmPvtFzPmUE8uvLBS+9OWIeZEqJZARcmSOvlt2ACfsHLkpEOwWBz pWaSxhdF44kYaFYAlMwQ6suzlVjsKZFZwHKAepQsblAyMNvjgeTw82SX4O7/YJt9kEs9 7nDrIQxP9qsY+kfJ/wsPF7l8Ew90+hP10z+bEUliEvTAK/Kz8djAji0XB5oRjD0TcFUc Jji6udTIrEngHv40Bbp2IihuTCxExmL0GAz8MB1jT4n7pNk1SFltujlTV0zhRIlUOv8o HHYA== X-Gm-Message-State: AOUpUlHDHbwhHfXmuvY0C8I9UU0qgNrkzsAWOgAHTA8fvLO1etnyr9Mj yPPrJPnKHZmaPt1h3GLX/6NV02wJ X-Google-Smtp-Source: AAOMgpd6/BhiVTJsl1H30UCAVCLGA9tN0JnVdD0WiR916il4DOPnn9DFKl1Cqpj23iOYQSRvM5LGXg== X-Received: by 2002:a63:e14a:: with SMTP id h10-v6mr351105pgk.358.1533165644845; Wed, 01 Aug 2018 16:20:44 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:43 -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 v3] util: Android.mk: Convert implicit rules to static pattern rules Date: Wed, 1 Aug 2018 16:20:36 -0700 Message-Id: <1533165638-13664-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! Change-Id: Id6dfd0d018cbd665fa19d80c14abd5f75fa10b8a 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 \