summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2021-09-07 02:51:19 -0500
committerGitHub <noreply@github.com>2021-09-07 08:51:19 +0100
commit54fbe555cd58f11d4ac4b76f4a2253c83667ccfd (patch)
tree20fca1aa0f6008e3e9e6e6e1cf687b1546d1a395 /var
parentc4e85faa2d1125bdd6e913914d565991c6979ec5 (diff)
downloadspack-54fbe555cd58f11d4ac4b76f4a2253c83667ccfd.tar.gz
spack-54fbe555cd58f11d4ac4b76f4a2253c83667ccfd.tar.bz2
spack-54fbe555cd58f11d4ac4b76f4a2253c83667ccfd.tar.xz
spack-54fbe555cd58f11d4ac4b76f4a2253c83667ccfd.zip
gdbm: fix build issue on macOS (#25811)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gdbm/macOS.patch14
-rw-r--r--var/spack/repos/builtin/packages/gdbm/package.py3
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gdbm/macOS.patch b/var/spack/repos/builtin/packages/gdbm/macOS.patch
new file mode 100644
index 0000000000..28db955ffa
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gdbm/macOS.patch
@@ -0,0 +1,14 @@
+--- a/src/gdbmshell.c 2021-09-02 07:39:55.000000000 -0500
++++ b/src/gdbmshell.c 2021-09-06 20:30:20.000000000 -0500
+@@ -1010,7 +1010,11 @@
+ fprintf (fp, "%s: ", snapname);
+ fprintf (fp, "%03o %s ", st.st_mode & 0777,
+ decode_mode (st.st_mode, buf));
++#if defined(__APPLE__)
++ fprintf (fp, "%ld.%09ld", st.st_mtimespec.tv_sec, st.st_mtimespec.tv_nsec);
++#else
+ fprintf (fp, "%ld.%09ld", st.st_mtim.tv_sec, st.st_mtim.tv_nsec);
++#endif
+ if (S_ISREG (st.st_mode))
+ {
+ GDBM_FILE dbf;
diff --git a/var/spack/repos/builtin/packages/gdbm/package.py b/var/spack/repos/builtin/packages/gdbm/package.py
index 3ee9551cba..0bb7336192 100644
--- a/var/spack/repos/builtin/packages/gdbm/package.py
+++ b/var/spack/repos/builtin/packages/gdbm/package.py
@@ -17,6 +17,7 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
gnu_mirror_path = "gdbm/gdbm-1.13.tar.gz"
version('1.21', sha256='b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2')
+ version('1.20', sha256='3aeac05648b3482a10a2da986b9f3a380a29ad650be80b9817a435fb8114a292')
version('1.19', sha256='37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc')
version('1.18.1', sha256='86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc')
version('1.14.1', sha256='cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f')
@@ -28,6 +29,8 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
version('1.9', sha256='f85324d7de3777db167581fd5d3493d2daa3e85e195a8ae9afc05b34551b6e57')
depends_on("readline")
+
+ patch('macOS.patch', when='@1.21: platform=darwin')
patch('gdbm.patch', when='@:1.18 %gcc@10:')
patch('gdbm.patch', when='@:1.18 %clang@11:')
patch('gdbm.patch', when='@:1.18 %cce@11:')