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: 10927475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AB4914B6 for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ADD121E5A for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E6F221FAD; Thu, 2 May 2019 18:03:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 124A021E5A for ; Thu, 2 May 2019 18:03:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CF4E89624; Thu, 2 May 2019 18:03:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8173896C7 for ; Thu, 2 May 2019 18:03:52 +0000 (UTC) Received: by mail-pl1-x635.google.com with SMTP id bi2so1364671plb.13 for ; Thu, 02 May 2019 11:03:52 -0700 (PDT) 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=l4m+ES0oM0OVHsbeYUTZ8ZTO7WeXNkq5u8ltrKbUnZcZ+x772Jb4FyiUo3ZDpGxjp2 kxpIxlCug6VnkJXoU3NMQ+UMBxz4Ryp/PkaKPcnPjNOCFato/IUJARMiQBBWVUaZsp/y c0HTe3tI9XGVIQIrVIgjyIsDOOM1AsFYhAj5pWLSWxoSLXzp589qOIfw+tU2mUfOKpJz 50Svsu+b/xxGTO9Basqi1a9HBB+G1sDD+bgi4HFhqtvBav0eHCCsUdcKrzBhJffMyWl5 eB4vGbxni2zxJ+Qdnj+heyToyDP3CnHHkdY70CCVSsG28XNv9kDDMCV94/7ZgfNNuXDA Kmow== X-Gm-Message-State: APjAAAXHvi8WTFue1zetDx1fI8pyF1r3ZOv2mHNe0+JPcvF1iCd6y4C2 tve2Whxqt6er18IYA1Yr5dcxihiHT74= 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) 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 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 X-Mailman-Original-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-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Clark , Amit Pundir , Greg Hartman , Emil Velikov , Alistair Strachan , Jason Ekstrand Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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 \