zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport Mesa MR#6053 to prevent multiply-defined symbols (#17720)

Browse Source 
Co-authored-by: Daryl W. Grunau <dwg@lanl.gov>
This commit is contained in:
Daryl W. Grunau 2020-07-30 21:04:24 -06:00 committed by GitHub
parent b86e620743
commit 7dd5793b75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/mesa/multiple-symbols_hash.patch Normal file
View File

@ -0,0 +1,22 @@
--- 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)

3
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -79,6 +79,9 @@ class Mesa(AutotoolsPackage):
# Prevent an unnecessary xcb-dri dependency # Prevent an unnecessary xcb-dri dependency
patch('autotools-x11-nodri.patch') patch('autotools-x11-nodri.patch')
# Backport Mesa MR#6053 to prevent multiply-defined symbols
patch('multiple-symbols_hash.patch', when='@:20.1.4%gcc@10:')
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
which('autoreconf')('--force', '--verbose', '--install') which('autoreconf')('--force', '--verbose', '--install')