aboutsummaryrefslogtreecommitdiffstats
path: root/src/util/SConscript
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-01-13 16:51:31 +0000
committerEmil Velikov <[email protected]>2017-01-18 19:07:23 +0000
commitd1efa09d342bff3e5def2978a0bef748d74f9c82 (patch)
tree079bd4ddeb05e068080337102c0b0ae13c1b101f /src/util/SConscript
parent5b4a5312078436479b6d6d3d8c6b6e7c0e10bbe1 (diff)
util: import sha1 implementation from OpenBSD17.0-branchpoint
At the moment we support 5+ different implementations each with varying amount of bugs - from thread safely problems [1], to outright broken implementation(s) [2] In order to accommodate these we have 150+ lines of configure script and extra two configure toggles. Whist an actual implementation being ~200loc and our current compat wrapping ~250. Let's not forget that different people use different code paths, thus effectively makes it harder to test and debug since the default implementation is automatically detected. To minimise all these lovely experiences, import the "100% Public Domain" OpenBSD sha1 implementation. Clearly document any changes needed to get building correctly, since many/most of those can be upstreamed making future syncs easier. As an added bonus this will avoid all the 'fun' experiences trying to integrate it with the Android and SCons builds. v2: Manually expand __BEGIN_DECLS/__END_DECLS and document (Tapani). Furthermore it seems that some games (or surrounding runtime) static link against OpenSSL resulting in conflicts. For more information see the discussion thread [3] Bugzilla [1]: https://bugs.freedesktop.org/show_bug.cgi?id=94904 Bugzilla [2]: https://bugs.freedesktop.org/show_bug.cgi?id=97967 [3] https://lists.freedesktop.org/archives/mesa-dev/2017-January/140748.html Cc: Mark Janes <[email protected]> Cc: Vinson Lee <[email protected]> Cc: Tapani Pälli <[email protected]> Cc: Jonathan Gray <[email protected]> Tested-by: Jonathan Gray <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Acked-by: Tapani Pälli <[email protected]> (v1) Acked-by: Jason Ekstrand <[email protected]> (v1)
Diffstat (limited to 'src/util/SConscript')
-rw-r--r--src/util/SConscript5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/util/SConscript b/src/util/SConscript
index 73f34303976..7e447f6e038 100644
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -33,11 +33,6 @@ mesautil_sources = (
source_lists['MESA_UTIL_GENERATED_FILES']
)
-# XXX We don't yet have scons support for detecting any of the various
-# HAVE_SHA1_* definitions, so for now simply disable the shader cache.
-if False:
- mesautil_sources += source_lists['MESA_UTIL_SHADER_CACHE_FILES']
-
mesautil = env.ConvenienceLibrary(
target = 'mesautil',
source = mesautil_sources,