hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gdbm: fix build issue on macOS (#25811)

Browse source
This commit is contained in:
Adam J. Stewart 2021-09-07 02:51:19 -05:00 committed by GitHub
parent c4e85faa2d
commit 54fbe555cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/gdbm/macOS.patch Normal file
View file

@ -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;

3
var/spack/repos/builtin/packages/gdbm/package.py
View file

@ -17,6 +17,7 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
gnu_mirror_path = "gdbm/gdbm-1.13.tar.gz" gnu_mirror_path = "gdbm/gdbm-1.13.tar.gz"
version('1.21', sha256='b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2') version('1.21', sha256='b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2')
version('1.20', sha256='3aeac05648b3482a10a2da986b9f3a380a29ad650be80b9817a435fb8114a292')
version('1.19', sha256='37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc') version('1.19', sha256='37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc')
version('1.18.1', sha256='86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc') version('1.18.1', sha256='86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc')
version('1.14.1', sha256='cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f') version('1.14.1', sha256='cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f')
@ -28,6 +29,8 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
version('1.9', sha256='f85324d7de3777db167581fd5d3493d2daa3e85e195a8ae9afc05b34551b6e57') version('1.9', sha256='f85324d7de3777db167581fd5d3493d2daa3e85e195a8ae9afc05b34551b6e57')
depends_on("readline") 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 %gcc@10:')
patch('gdbm.patch', when='@:1.18 %clang@11:') patch('gdbm.patch', when='@:1.18 %clang@11:')
patch('gdbm.patch', when='@:1.18 %cce@11:') patch('gdbm.patch', when='@:1.18 %cce@11:')