summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Blake <blake14@llnl.gov>2021-02-23 19:13:22 -0800
committerGitHub <noreply@github.com>2021-02-23 19:13:22 -0800
commit0389f51bd75d86e17ba4b2836b863d98d0a1c15f (patch)
treea9426b6224abb9eac0278ceea575f0873475bd4c
parent61c8bc2b19941bb009bf261337765a2475a42459 (diff)
downloadspack-0389f51bd75d86e17ba4b2836b863d98d0a1c15f.tar.gz
spack-0389f51bd75d86e17ba4b2836b863d98d0a1c15f.tar.bz2
spack-0389f51bd75d86e17ba4b2836b863d98d0a1c15f.tar.xz
spack-0389f51bd75d86e17ba4b2836b863d98d0a1c15f.zip
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
-rw-r--r--var/spack/repos/builtin/packages/numactl/fix-empty-block.patch13
-rw-r--r--var/spack/repos/builtin/packages/numactl/package.py1
2 files changed, 14 insertions, 0 deletions
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 0000000000..9ddf07c6e1
--- /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 db2b9eaaaa..f6c82f5522 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')