diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-09-22 11:25:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 12:25:54 -0400 |
| commit | 9558377f0fc5485b72082152843cb52e2e366f70 (patch) | |
| tree | e44407ee9fc158f76a601173a70dc5eb5bb6b15e | |
| parent | 9e906e2d474c2a95182eb9b1615b10e624293dee (diff) | |
| download | spack-9558377f0fc5485b72082152843cb52e2e366f70.tar.gz spack-9558377f0fc5485b72082152843cb52e2e366f70.tar.bz2 spack-9558377f0fc5485b72082152843cb52e2e366f70.tar.xz spack-9558377f0fc5485b72082152843cb52e2e366f70.zip | |
Bash: fix build with Xcode 12 (#18843)
| -rw-r--r-- | var/spack/repos/builtin/packages/bash/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch | 18 |
2 files changed, 21 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 1bdd11fe5e..c3897bb60b 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -48,6 +48,8 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): patch('https://ftpmirror.gnu.org/bash/bash-{0}-patches/bash{1}-{2}'.format(ver, ver.joined, num), level=0, when='@{0}'.format(ver), sha256=checksum) + patch('xcode12-strsignal-conf.patch', when='@:5.0 %apple-clang@12:') + executables = ['^bash$'] @classmethod @@ -60,7 +62,7 @@ class Bash(AutotoolsPackage, GNUMirrorPackage): spec = self.spec return [ - 'LIBS=-lncursesw', + 'LIBS=' + spec['ncurses'].libs.link_flags, '--with-curses', '--enable-readline', '--with-installed-readline', diff --git a/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch b/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch new file mode 100644 index 0000000000..4f5f5abfa0 --- /dev/null +++ b/var/spack/repos/builtin/packages/bash/xcode12-strsignal-conf.patch @@ -0,0 +1,18 @@ +--- a/configure 2019-01-02 08:43:31.000000000 -0600 ++++ b/configure 2020-09-21 10:40:42.000000000 -0500 +@@ -14568,6 +14568,7 @@ + /* end confdefs.h. */ + #include <sys/types.h> + #include <signal.h> ++#include <string.h> + int + main () + { +@@ -14999,6 +15000,7 @@ + /* end confdefs.h. */ + + #include <stdio.h> ++#include <stdlib.h> + + main() + { |