spack/var/spack/repos/builtin/packages/mesa/multiple-symbols_hash.patch
Daryl W. Grunau 7dd5793b75
backport Mesa MR#6053 to prevent multiply-defined symbols (#17720)
Co-authored-by: Daryl W. Grunau <dwg@lanl.gov>
2020-07-30 22:04:24 -05:00

23 lines
820 B
Diff

--- a/src/gallium/auxiliary/util/u_debug_stack.c 2019-11-07 17:57:36.000000000 -0700
+++ b/src/gallium/auxiliary/util/u_debug_stack.c 2020-07-23 15:30:46.033145497 -0600
@@ -46,7 +46,7 @@
#include "os/os_thread.h"
#include "u_hash_table.h"
-struct util_hash_table* symbols_hash;
+static struct util_hash_table* symbols_hash;
static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
static unsigned hash_ptr(void* p)
--- a/src/gallium/auxiliary/util/u_debug_symbol.c 2019-11-07 17:58:53.000000000 -0700
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c 2020-07-23 15:31:06.400146072 -0600
@@ -270,7 +270,7 @@
debug_printf("\t%s\n", buf);
}
-struct util_hash_table* symbols_hash;
+static struct util_hash_table* symbols_hash;
static mtx_t symbols_mutex = _MTX_INITIALIZER_NP;
static unsigned hash_ptr(void* p)