me/guix
Archived
1
0
Fork 0
Code Activity

gnu: m4: Upgrade to 1.4.17.

Browse source 
* gnu/packages/m4.scm (m4): Upgrade to 1.4.17.  Remove
  'm4-s_isdir.patch' and 'm4-gets-undeclared.patch'.
* gnu/packages/patches/m4-s_isdir.patch: Remove.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2013-09-25 00:38:04 +02:00
parent 5608847c6f
commit 1fa49a2c46
3 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

@ -222,7 +222,6 @@ dist_patch_DATA = \
gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/libtool-skip-tests.patch \
gnu/packages/patches/m4-gets-undeclared.patch \ gnu/packages/patches/m4-gets-undeclared.patch \
gnu/packages/patches/m4-readlink-EINVAL.patch \ gnu/packages/patches/m4-readlink-EINVAL.patch \
gnu/packages/patches/m4-s_isdir.patch \
gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/make-impure-dirs.patch \
gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mcron-install.patch \
gnu/packages/patches/perl-no-sys-dirs.patch \ gnu/packages/patches/perl-no-sys-dirs.patch \

16
gnu/packages/m4.scm
View file

@ -26,14 +26,14 @@
(define-public m4 (define-public m4
(package (package
(name "m4") (name "m4")
(version "1.4.16") (version "1.4.17")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/m4/m4-" (uri (string-append "mirror://gnu/m4/m4-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"035r7ma272j2cwni2961jp22k6bn3n9xwn3b3qbcn2yrvlghql22")))) "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; XXX: Disable tests on those platforms with know issues. ;; XXX: Disable tests on those platforms with know issues.
@ -41,10 +41,8 @@
'("x86_64-darwin" '("x86_64-darwin"
"i686-cygwin" "i686-cygwin"
"i686-sunos"))) "i686-sunos")))
#:patches (list (assoc-ref %build-inputs "patch/s_isdir") #:patches (list (assoc-ref %build-inputs
(assoc-ref %build-inputs "patch/readlink-EINVAL"))
"patch/readlink-EINVAL")
(assoc-ref %build-inputs "patch/gets"))
#:phases (alist-cons-before #:phases (alist-cons-before
'check 'pre-check 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -57,10 +55,8 @@
(("/bin/sh") (("/bin/sh")
(format #f "~a/bin/bash" bash))))) (format #f "~a/bin/bash" bash)))))
%standard-phases))) %standard-phases)))
(inputs `(("patch/s_isdir" ,(search-patch "m4-s_isdir.patch")) (inputs `(("patch/readlink-EINVAL"
("patch/readlink-EINVAL" ,(search-patch "m4-readlink-EINVAL.patch"))))
,(search-patch "m4-readlink-EINVAL.patch"))
("patch/gets" ,(search-patch "m4-gets-undeclared.patch"))))
(synopsis "Macro processor") (synopsis "Macro processor")
(description (description
"GNU M4 is an implementation of the traditional Unix macro processor. It "GNU M4 is an implementation of the traditional Unix macro processor. It

14
gnu/packages/patches/m4-s_isdir.patch
View file

@ -1,14 +0,0 @@
Fails to build with glibc 2.12.1 without this patch.
http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html
--- a/src/path.c
+++ b/src/path.c
@@ -22,6 +22,7 @@
/* Handling of path search of included files via the builtins "include"
and "sinclude". */
#include "m4.h"
+#include "sys/stat.h"
struct includes