From 15be91b585c9719ca972d790a4fccecc90b10b7c Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 18 Aug 2022 19:55:04 +0200 Subject: autoconf-archive: fetch patch from github (#32232) * autoconf-archive: fetch patch from github * autoconf-archive: do not try to patch libtool --- .../2022.02.11-ax_cc_maxopt-nvhpc.patch | 30 ---------------------- .../builtin/packages/autoconf-archive/package.py | 10 ++++++-- 2 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch 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 deleted file mode 100644 index 78fceda215..0000000000 --- a/var/spack/repos/builtin/packages/autoconf-archive/2022.02.11-ax_cc_maxopt-nvhpc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c92672b9c59f9011e5d68220e99cfdd70c1b98df Mon Sep 17 00:00:00 2001 -From: Reuben Thomas -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 138aa4b565..e6e3d1cb8a 100644 --- a/var/spack/repos/builtin/packages/autoconf-archive/package.py +++ b/var/spack/repos/builtin/packages/autoconf-archive/package.py @@ -21,8 +21,14 @@ class AutoconfArchive(AutotoolsPackage, GNUMirrorPackage): "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") + patch( + "https://github.com/autoconf-archive/autoconf-archive/commit/510672bc200e869fb0ad4634407561be819cf093.patch?full_index=1", + sha256="139214f5104f699f868dc87a14378e1e694a3c2539efa0de6f878024f3d7c66d", + when="@2022.02.11", + ) + + # The package does not produce any libraries and does not use libtool: + patch_libtool = False def setup_dependent_build_environment(self, env, dependent_spec): """Adds the ACLOCAL path for autotools.""" -- cgit v1.2.3-70-g09d2