diff options
| author | gdt <gdt@pkgsrc.org> | 2015-01-10 16:15:29 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2015-01-10 16:15:29 +0000 |
| commit | 14dca8fdf4690d5bcf9b9a1c1224313fcca39ec9 (patch) | |
| tree | af8422836fc5dbe52596709cb94999d188b78ccd /editors | |
| parent | 4bb322c81b3f835e9a3386f88432210c5cb74f36 (diff) | |
| download | pkgsrc-14dca8fdf4690d5bcf9b9a1c1224313fcca39ec9.tar.gz | |
Copy gnulib readlinkat patch from archivers/gtar-base.
This undefines readlink so that the twisty maze of symlinks builds,
and fixes the build on netbsd-5. Confirmed to work on netbsd-5/amd64
and netbsd-6/i386. Thanks to obache@ for pointing out the problem.
I will request a pullup to 2014Q4 soon if there are no objections.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs24-nox11/Makefile | 3 | ||||
| -rw-r--r-- | editors/emacs24/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs24/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs24/patches/patch-gnu_readlinkat.c | 14 |
4 files changed, 21 insertions, 3 deletions
diff --git a/editors/emacs24-nox11/Makefile b/editors/emacs24-nox11/Makefile index d02c4bc354a..7b3742f1b2f 100644 --- a/editors/emacs24-nox11/Makefile +++ b/editors/emacs24-nox11/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2014/10/28 12:44:05 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2015/01/10 16:15:30 gdt Exp $ PKGNAME= ${DISTNAME:S/emacs/emacs24/:S/-/-nox11-/} +PKGREVISION= 1 CONFLICTS+= emacs24-[0-9]* diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile index a4d958756b1..8bbd01f93b9 100644 --- a/editors/emacs24/Makefile +++ b/editors/emacs24/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2014/10/28 12:43:21 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2015/01/10 16:15:29 gdt Exp $ + +PKGREVISION= 1 CONFLICTS+= emacs24-nox11-[0-9]* diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo index c14f956398e..ff6788a973f 100644 --- a/editors/emacs24/distinfo +++ b/editors/emacs24/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.14 2014/10/28 12:43:21 wiz Exp $ +$NetBSD: distinfo,v 1.15 2015/01/10 16:15:30 gdt Exp $ SHA1 (emacs-24.4.tar.gz) = df540d889a685a3ccaae94682b3ff131968e2706 RMD160 (emacs-24.4.tar.gz) = 52bec18c5f8e4ee7ea3b765620c0f19d2ee524c9 Size (emacs-24.4.tar.gz) = 59020082 bytes +SHA1 (patch-gnu_readlinkat.c) = 9252c92290ccf1d4094bbd3972d8309ebf9e57d6 diff --git a/editors/emacs24/patches/patch-gnu_readlinkat.c b/editors/emacs24/patches/patch-gnu_readlinkat.c new file mode 100644 index 00000000000..cf72030df4d --- /dev/null +++ b/editors/emacs24/patches/patch-gnu_readlinkat.c @@ -0,0 +1,14 @@ +$NetBSD: patch-gnu_readlinkat.c,v 1.1 2015/01/10 16:15:30 gdt Exp $ + +* workaround for NetBSD-5.x, readlink is defined as a macro. + +--- lib/readlinkat.c.orig 2013-06-29 05:54:25.000000000 +0000 ++++ lib/readlinkat.c +@@ -41,6 +41,7 @@ + #define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t len + #define AT_FUNC_POST_FILE_ARGS , buf, len + #define AT_FUNC_RESULT ssize_t ++#undef readlink + #include "at-func.c" + #undef AT_FUNC_NAME + #undef AT_FUNC_F1 |