diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2022-05-16 23:29:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 03:29:42 +0000 |
| commit | 3fcd85efe982be3f75d77a1038446300cb9f1489 (patch) | |
| tree | 4d951f78314d6cfb9489aaaed313be796a747e0d | |
| parent | 6f3a082c3ed56be817ccaf1888e4749dccbc33d4 (diff) | |
| download | spack-3fcd85efe982be3f75d77a1038446300cb9f1489.tar.gz spack-3fcd85efe982be3f75d77a1038446300cb9f1489.tar.bz2 spack-3fcd85efe982be3f75d77a1038446300cb9f1489.tar.xz spack-3fcd85efe982be3f75d77a1038446300cb9f1489.zip | |
autoconf-archive: Patch for nvhpc support and propagate search dirs (#30692)
| -rw-r--r-- | var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch | 30 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/autoconf-archive/package.py | 7 |
2 files changed, 37 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch b/var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch new file mode 100644 index 0000000000..78fceda215 --- /dev/null +++ b/var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch @@ -0,0 +1,30 @@ +From c92672b9c59f9011e5d68220e99cfdd70c1b98df Mon Sep 17 00:00:00 2001 +From: Reuben Thomas <rrt@sc3d.org> +Date: Mon, 25 Apr 2022 12:37:10 +0100 +Subject: [PATCH] m4/ax_cc_maxopt.m4: add missing ;; to end of case + +--- + m4/ax_cc_maxopt.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/m4/ax_cc_maxopt.m4 b/m4/ax_cc_maxopt.m4 +index 05218e36..7ad53438 100644 +--- a/m4/ax_cc_maxopt.m4 ++++ b/m4/ax_cc_maxopt.m4 +@@ -55,7 +55,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 22 ++#serial 23 + + AC_DEFUN([AX_CC_MAXOPT], + [ +@@ -146,6 +146,7 @@ if test "x$ac_test_CFLAGS" = "x"; then + nvhpc) + # default optimization flags for nvhpc + CFLAGS="$CFLAGS -O3" ++ ;; + + gnu) + # default optimization flags for gcc on all systems diff --git a/var/spack/repos/builtin/packages/autoconf-archive/package.py b/var/spack/repos/builtin/packages/autoconf-archive/package.py index ed735191a8..7924bc36d5 100644 --- a/var/spack/repos/builtin/packages/autoconf-archive/package.py +++ b/var/spack/repos/builtin/packages/autoconf-archive/package.py @@ -13,3 +13,10 @@ class AutoconfArchive(AutotoolsPackage, GNUMirrorPackage): version('2022.02.11', sha256='78a61b611e2eeb55a89e0398e0ce387bcaf57fe2dd53c6fe427130f777ad1e8c') version('2019.01.06', sha256='17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f') + + # https://github.com/autoconf-archive/autoconf-archive/pull/251 + patch('2022.02.11-ax_cc_maxopt-nvhpc.patch', when='@2022.02.11') + + def setup_dependent_build_environment(self, env, dependent_spec): + """Adds the ACLOCAL path for autotools.""" + env.append_path('ACLOCAL_PATH', self.prefix.share.aclocal) |