From 0389f51bd75d86e17ba4b2836b863d98d0a1c15f Mon Sep 17 00:00:00 2001 From: Robert Blake Date: Tue, 23 Feb 2021 19:13:22 -0800 Subject: [PATCH] numactl: no-op needed if configure can't find TLS (#21894) * numactl: Bash needs no-op if configure can't find TLS * Upstream has fix, will be out in next version. https://github.com/numactl/numactl/pull/103 --- .../builtin/packages/numactl/fix-empty-block.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/numactl/package.py | 1 + 2 files changed, 14 insertions(+) create mode 100644 var/spack/repos/builtin/packages/numactl/fix-empty-block.patch diff --git a/var/spack/repos/builtin/packages/numactl/fix-empty-block.patch b/var/spack/repos/builtin/packages/numactl/fix-empty-block.patch new file mode 100644 index 00000000000..9ddf07c6e19 --- /dev/null +++ b/var/spack/repos/builtin/packages/numactl/fix-empty-block.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index ef39707..659a765 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,7 @@ AC_PROG_CC + # Override CFLAGS so that we can specify custom CFLAGS for numademo. + AX_AM_OVERRIDE_VAR([CFLAGS]) + +-AX_TLS ++AX_TLS([:],[:]) + + AX_CHECK_COMPILE_FLAG([-ftree-vectorize], [tree_vectorize="true"]) + AM_CONDITIONAL([HAVE_TREE_VECTORIZE], [test x"${tree_vectorize}" = x"true"]) diff --git a/var/spack/repos/builtin/packages/numactl/package.py b/var/spack/repos/builtin/packages/numactl/package.py index db2b9eaaaad..f6c82f55222 100644 --- a/var/spack/repos/builtin/packages/numactl/package.py +++ b/var/spack/repos/builtin/packages/numactl/package.py @@ -21,6 +21,7 @@ class Numactl(AutotoolsPackage): patch('numactl-2.0.11-sysmacros.patch', when="@2.0.11") # https://github.com/numactl/numactl/issues/94 patch('numactl-2.0.14-symver.patch', when="@2.0.14") + patch('fix-empty-block.patch', when="@2.0.10:2.0.14") depends_on('autoconf', type='build') depends_on('automake', type='build')