diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-02-17 23:01:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-02-17 23:01:54 +0100 |
| commit | eb07edabaf11e39b25f5cf40967afd3dadcb14eb (patch) | |
| tree | 2891cac86fc706587284a89ed5e3a4c9461d349f /gnu/packages | |
| parent | 88f85494491a0cd4d4262c97860f01e99c2bc313 (diff) | |
| download | guix-patches-eb07edabaf11e39b25f5cf40967afd3dadcb14eb.tar guix-patches-eb07edabaf11e39b25f5cf40967afd3dadcb14eb.tar.gz | |
gnu: datefudge: Fix compilation against libc 2.31.
* gnu/packages/patches/datefudge-gettimeofday.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/time.scm (datefudge)[source] Use it.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/patches/datefudge-gettimeofday.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/time.scm | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/patches/datefudge-gettimeofday.patch b/gnu/packages/patches/datefudge-gettimeofday.patch new file mode 100644 index 0000000000..11c7640869 --- /dev/null +++ b/gnu/packages/patches/datefudge-gettimeofday.patch @@ -0,0 +1,13 @@ +Add the 'restrict' qualifier to match the 'gettimeofday' declaration found +in glibc 2.31. + +--- datefudge-1.23/datefudge.c 2020-02-17 22:35:21.343341725 +0100 ++++ datefudge-1.23/datefudge.c 2020-02-17 22:35:49.619117874 +0100 +@@ -78,6 +78,6 @@ + return 0; + } + +-int gettimeofday(struct timeval *x, struct timezone *y) { ++int gettimeofday(struct timeval *restrict x, void *restrict y) { + return __gettimeofday(x,y); + } diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 63227d7bf5..b9ce791827 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -39,6 +39,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages perl) @@ -429,7 +430,8 @@ datetime type.") (file-name (git-file-name name version)) (sha256 (base32 - "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv")))) + "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv")) + (patches (search-patches "datefudge-gettimeofday.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" |