From patchwork Thu May 2 18:03:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 163278 Delivered-To: patches@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp6032609ill; Thu, 2 May 2019 11:03:52 -0700 (PDT) X-Received: by 2002:aa7:991b:: with SMTP id z27mr5626445pff.168.1556820232315; Thu, 02 May 2019 11:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556820232; cv=none; d=google.com; s=arc-20160816; b=x2jeFY5Y4ZtNtPHyPb3HPveVB6Tp5lz0Lotymj7WN2MUobfFl/RAySFAWkqgaMU6D/ rjIm4rPqHGB6gZ7aCHQ+VDnboN0poGFG+DtKU+U4pCGj2Jr4P+g0lNxO3VRCXUD5PdV5 Xr5SVEqH7GNY7rAQiIs1CGCYM7q5BTmgA452znfI5Zwl1Jp6GUIFtPaZ0PKJtiMMkKgu 4ZM39DQyKuZDiiNQHTaa4VsGVC6PvKDIov4qoSdCGWOY2Xg0Aux3Q/JuT8vicbAEjLQT ES0MG/yIbRThnX2BDCfFj1L5QlAAfnMxBEjuA4uFWQ//8TfGO5miqRduDljtQyjrNUS1 uLWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=bZn++V7NO6N5SqxofcbezbnMkE5pMAM2HQ8KtiAidAVh+pnUoJP/JE7OzwUl7AZA2u RwsQvc4QcM4CL010olUM9rLCEb/JAhShNhqhaZgm1QSUmC8+xB1h8pgB0IIy3tlDGThZ 8MDehFNUL/ETkkpSNcgMKShXZJZNZ/WdkXJVHy+4B+YB5VrwO2NLMLGV36KKFrEnjLrM joH81QiOEFcTJIbyJFOpu2CaVfmvrAt4ky3gsVLlrzLyI68gwTo1ld7JJKPm6tcQZ0ar WqIFhAX3F+0oQr7tdQLZxMWhr2zsAMLwMozV+mm059j7W98D71DhzsXFdXli+g3r/UXk 5oJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ae66Y7F/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 59sor8532726plb.24.2019.05.02.11.03.52 for (Google Transport Security); Thu, 02 May 2019 11:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ae66Y7F/"; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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 :mime-version:content-transfer-encoding; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=Ae66Y7F/dz45twsOu9n7DNHzu7fDmDinbKFOhwOIDbzyel45V5/hlkdzCLhrBt80xs rQ1l085cqF7I7rLWcXnlFO/WizWbM0XDVooXVRAAuurmZBH35NnQinmLmyzRpocAwwSM TtK+VBUvoqcHQyttDaSBVmeT9ImkUDX5I7E3BprFrl+WprOceJI5SyiFRdlIpP0gi6/Z FNWxoyiwmZ0VG2JJp/R47NUEyUmy9Koru/29p+Aqf7XkcrTIwUllDbk16+RTBb1vtn4z b89YoTM7oNT7XEvMqJoowzKu6G9uCvyrK8f1x9rJeDWoejDrFscJeFeiwNMr6cfyTjn4 vKtg== 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:mime-version:content-transfer-encoding; bh=KwVol6+NAKSj5claaoAPzFfVv/0b5wE9kH8oSQrsELw=; b=EKHRl30GE5VpuyFfP7hp4ArQ9FSwdX5BZtgMEMhjTRkYFA0CEF7vEGGLetLeLl9JaR +Ed9vq55uSz5Pd6Hd38Er6XZA4AgyZOxybfeOEDCDw6vOsfUsg/+JfiSeFA1zZByEiLi OakTP0J9D7LGOLVfTMTBYrqIdyb2sVzzBS4zaCVI2dZUTI5cZAonH1kve/OSggCzXShb r34AZYTXevLG4ABjy6NaC5T1zW3OdMcbcbkmmD7yqfXIafve2b4QESQIl7CoeEJ+0+iW o0GaNiJkD3mOJBJFSW4BD7Lw11OQim6YsqGrnYjgGdjmSqFRCqqNkuMgBj3JaVPA48wr LyMw== X-Gm-Message-State: APjAAAVGBreYWvbrG+Qa8oNiNII871OPWfVgWd4RHwnjPJmJT3rBR6Uc 1plAO/4ZLRqsSyBKqi8cNkC685aZ X-Google-Smtp-Source: APXvYqxdQTwKKcU21LwdRQIjdVvZ98Sfx9QUUzY2yxE9nyVZChVPu8kynaBWXQkGfs6WB28F/Lmmrw== X-Received: by 2002:a17:902:9f8c:: with SMTP id g12mr5228709plq.256.1556820231855; Thu, 02 May 2019 11:03:51 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c18sm90371672pfc.0.2019.05.02.11.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 11:03:50 -0700 (PDT) From: John Stultz To: dri-devel Cc: Alistair Strachan , Rob Clark , Emil Velikov , Amit Pundir , Sumit Semwal , Greg Hartman , =?utf-8?q?Tapani_P=C3=A4lli?= , Jason Ekstrand , John Stultz Subject: [RFC][PATCH 1/3] mesa: android: Remove unnecessary dependency tracking rules Date: Thu, 2 May 2019 11:03:44 -0700 Message-Id: <20190502180346.4769-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502180346.4769-1-john.stultz@linaro.org> References: <20190502180346.4769-1-john.stultz@linaro.org> MIME-Version: 1.0 From: Alistair Strachan The current AOSP master build system breaks building mesa due to the following error: external/mesa3d/src/compiler/Android.glsl.gen.mk:94: error: writing to readonly directory: "external/mesa3d/src/compiler/glsl/ir.h" This error is bogus -- nothing "writes" to ir.h -- but the rule is unnecessary because the generated header that is a dependency of the non-generated header should be added to LOCAL_GENERATED_SOURCES and this will track if the dependency needs to be regenerated. (This change fixes a similar problem affecting nir.h too.) Cc: Rob Clark Cc: Emil Velikov Cc: Amit Pundir Cc: Sumit Semwal Cc: Alistair Strachan Cc: Greg Hartman Cc: Tapani Pälli Cc: Jason Ekstrand Signed-off-by: Alistair Strachan [jstultz: Forward ported and tweaked commit subject] Signed-off-by: John Stultz --- src/compiler/Android.glsl.gen.mk | 2 -- src/compiler/Android.nir.gen.mk | 2 -- 2 files changed, 4 deletions(-) -- 2.17.1 diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk index 3b94ea7bd2f..1308de2db97 100644 --- a/src/compiler/Android.glsl.gen.mk +++ b/src/compiler/Android.glsl.gen.mk @@ -90,8 +90,6 @@ $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y $(call glsl_local-y-to-c-and-h) -$(LOCAL_PATH)/glsl/ir.h: $(intermediates)/glsl/ir_expression_operation.h - $(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< enum > $@ diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk index 894fb12c4be..26115f446a3 100644 --- a/src/compiler/Android.nir.gen.mk +++ b/src/compiler/Android.nir.gen.mk @@ -76,8 +76,6 @@ $(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@ -$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h - nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py nir_opcodes_c_deps := \ $(LOCAL_PATH)/nir/nir_opcodes.py \