From c3f4822f92e0afc70f3a642310c7e1282434d397 Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Wed, 28 Jun 2023 14:02:52 -0500 Subject: [PATCH] pruners-ninja: patch in upstream fix for spack issue #32112 (#38613) --- .../builtin/packages/pruners-ninja/package.py | 2 ++ .../pruners-mutli-def-a-pr3-fix.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 var/spack/repos/builtin/packages/pruners-ninja/pruners-mutli-def-a-pr3-fix.patch diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py index f550fe3448..7ec3f33243 100644 --- a/var/spack/repos/builtin/packages/pruners-ninja/package.py +++ b/var/spack/repos/builtin/packages/pruners-ninja/package.py @@ -22,3 +22,5 @@ class PrunersNinja(AutotoolsPackage): depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") + + patch("pruners-mutli-def-a-pr3-fix.patch") diff --git a/var/spack/repos/builtin/packages/pruners-ninja/pruners-mutli-def-a-pr3-fix.patch b/var/spack/repos/builtin/packages/pruners-ninja/pruners-mutli-def-a-pr3-fix.patch new file mode 100644 index 0000000000..2396c8df77 --- /dev/null +++ b/var/spack/repos/builtin/packages/pruners-ninja/pruners-mutli-def-a-pr3-fix.patch @@ -0,0 +1,24 @@ +diff -ruN spack-src/test/ninja_test_hypre_parasails.c spack-src-patched/test/ninja_test_hypre_parasails.c +--- spack-src/test/ninja_test_hypre_parasails.c 2017-04-25 12:24:43.000000000 -0700 ++++ spack-src-patched/test/ninja_test_hypre_parasails.c 2023-06-28 07:41:49.676373145 -0700 +@@ -306,7 +306,7 @@ + + #define LEN (64) + float calibration = 1; +-int a[LEN]; ++static int a[LEN]; + static void do_noise_work(float msec, int bool) + { + #ifdef ENABLE_NOISE +diff -ruN spack-src/test/ninja_test_util.c spack-src-patched/test/ninja_test_util.c +--- spack-src/test/ninja_test_util.c 2017-03-13 15:36:28.000000000 -0700 ++++ spack-src-patched/test/ninja_test_util.c 2023-06-28 07:42:06.444492687 -0700 +@@ -31,7 +31,7 @@ + + #define LEN (2) + int lpusec; +-int a[LEN]; ++static int a[LEN]; + static void do_noise_work(int loops) + { + int i;