From 3fd3676fc0d4188044d340d16d7588e6c267746a Mon Sep 17 00:00:00 2001 From: Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com> Date: Mon, 19 Oct 2020 19:49:31 -0500 Subject: gdbm patch (#19380) * gdbm patching * compiler name fix * rename patch --- var/spack/repos/builtin/packages/gdbm/gdbm.patch | 11 +++++++++++ var/spack/repos/builtin/packages/gdbm/gdbm_gcc_10.patch | 11 ----------- var/spack/repos/builtin/packages/gdbm/package.py | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 var/spack/repos/builtin/packages/gdbm/gdbm.patch delete mode 100644 var/spack/repos/builtin/packages/gdbm/gdbm_gcc_10.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gdbm/gdbm.patch b/var/spack/repos/builtin/packages/gdbm/gdbm.patch new file mode 100644 index 0000000000..6f04bfcb32 --- /dev/null +++ b/var/spack/repos/builtin/packages/gdbm/gdbm.patch @@ -0,0 +1,11 @@ +--- gdbm-1.18.1/src/parseopt.c 2018-05-30 03:39:15.000000000 -0600 ++++ gdbm-1.18.1_new/src/parseopt.c 2020-04-30 10:29:52.869582500 -0600 +@@ -255,8 +255,6 @@ + } + + char *parseopt_program_name; +-char *parseopt_program_doc; +-char *parseopt_program_args; + const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; + void (*parseopt_help_hook) (FILE *stream); + diff --git a/var/spack/repos/builtin/packages/gdbm/gdbm_gcc_10.patch b/var/spack/repos/builtin/packages/gdbm/gdbm_gcc_10.patch deleted file mode 100644 index 6f04bfcb32..0000000000 --- a/var/spack/repos/builtin/packages/gdbm/gdbm_gcc_10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gdbm-1.18.1/src/parseopt.c 2018-05-30 03:39:15.000000000 -0600 -+++ gdbm-1.18.1_new/src/parseopt.c 2020-04-30 10:29:52.869582500 -0600 -@@ -255,8 +255,6 @@ - } - - char *parseopt_program_name; --char *parseopt_program_doc; --char *parseopt_program_args; - const char *program_bug_address = "<" PACKAGE_BUGREPORT ">"; - void (*parseopt_help_hook) (FILE *stream); - diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py index ae89387f24..c0d13b7ce0 100644 --- a/var/spack/repos/builtin/packages/gdbm/package.py +++ b/var/spack/repos/builtin/packages/gdbm/package.py @@ -26,7 +26,8 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage): version('1.9', sha256='f85324d7de3777db167581fd5d3493d2daa3e85e195a8ae9afc05b34551b6e57') depends_on("readline") - patch('gdbm_gcc_10.patch', when='%gcc@10:') + patch('gdbm.patch', when='%gcc@10:') + patch('gdbm.patch', when='%clang@11:') def configure_args(self): -- cgit v1.2.3-70-g09d2