util: always include sha1 into the build

SHA1 is now used in all builds when HAVE_SHA1 is defined. Adjust src to
do the same thing, rather than predicating on shader cache.

Fixes: 04e201d0c02 ("mesa: change 'SHADER_SUBST' facility to work with env variables")
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@gmail.com>

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1e087b40d38876208f4bbd8eb502d87145c31162..761023d186febfce74711622255426eaf247fe5c 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -44,11 +44,7 @@ libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
        $(MESA_UTIL_GENERATED_FILES)
 
-if ENABLE_SHADER_CACHE
-libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES)
-
 libmesautil_la_LIBADD = $(SHA1_LIBS)
-endif
 
 roundeven_test_LDADD = -lm
 

diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 82df3bcb00aa6a67f5a6d1a43955a2447ade61bf..afdd0cb3b5c73efa15a914cfb0b0f9539de9a9a3 100644 (file)
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -1,7 +1,3 @@
-MESA_UTIL_SHADER_CACHE_FILES := \
-       mesa-sha1.c \
-       mesa-sha1.h
-
 MESA_UTIL_FILES :=     \
        bitset.h \
        format_srgb.h \
@@ -9,6 +5,8 @@ MESA_UTIL_FILES :=      \
        hash_table.h \
        list.h \
        macros.h \
+       mesa-sha1.c \
+       mesa-sha1.h \
        ralloc.c \
        ralloc.h \
        register_allocate.c \

diff --git a/src/util/mesa-sha1.c b/src/util/mesa-sha1.c
index fa2819377747189b715fced2b0af768aeff030ae..7614b21c8baf955d6871e83cb156056d076c9038 100644 (file)
--- a/src/util/mesa-sha1.c
+++ b/src/util/mesa-sha1.c
@@ -290,6 +290,8 @@ _mesa_sha1_final(struct mesa_sha1 *ctx, unsigned char result[20])
 
 #endif
 
+#ifdef HAVE_SHA1
+
 void
 _mesa_sha1_compute(const void *data, size_t size, unsigned char result[20])
 {
@@ -314,3 +316,5 @@ _mesa_sha1_format(char *buf, const unsigned char *sha1)
 
    return buf;
 }
+
+#endif