Skip to content

Commit

Permalink
Add upstream patch fixing build on Solaris 9 with Sun Studio 11.
Browse files Browse the repository at this point in the history
Suggested by Stephen Nelson-Smith <sanelson@gmail.com> on pkgsrc-users.
  • Loading branch information
wiz committed Apr 27, 2012
1 parent 8819967 commit 60acf5e
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
3 changes: 2 additions & 1 deletion devel/m4/distinfo
@@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.34 2012/01/31 01:12:46 christos Exp $
$NetBSD: distinfo,v 1.35 2012/04/27 21:01:41 wiz Exp $

SHA1 (m4-1.4.16.tar.gz) = 44b3ed8931f65cdab02aee66ae1e49724d2551a4
RMD160 (m4-1.4.16.tar.gz) = 9b161898b9fb2fc44614e644a0e3bdab3ff1328b
Size (m4-1.4.16.tar.gz) = 1657870 bytes
SHA1 (patch-aa) = ef316620b49f78f46e9dea47032b0141814c1f43
SHA1 (patch-ab) = b29840365e983623bce64e84ceab3504b8270b32
SHA1 (patch-ac) = 7bd9164c659727a906ef54a2f1027e9fd19315ba
SHA1 (patch-lib_verror.h) = 4c50ab0bc90a6324845e145bbe140836179ca8c9
41 changes: 41 additions & 0 deletions devel/m4/patches/patch-lib_verror.h
@@ -0,0 +1,41 @@
$NetBSD: patch-lib_verror.h,v 1.1 2012/04/27 21:01:41 wiz Exp $

2011-03-20 Bruno Haible <bruno@clisp.org>

verror: Fix compilation error introduced on 2011-02-13.
* lib/verror.h (verror, verror_at_line): Use _GL_ATTRIBUTE_FORMAT macro
instead of __attribute__.
Reported by Tom G. Christensen <tgc@jupiterrise.com>.

--- lib/verror.h.orig 2011-03-01 16:39:30.000000000 +0000
+++ lib/verror.h
@@ -17,9 +17,10 @@
#ifndef _VERROR_H
#define _VERROR_H 1

-#include "error.h"
#include <stdarg.h>

+#include "error.h" /* for _GL_ATTRIBUTE_FORMAT */
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -32,7 +33,7 @@ extern "C" {

extern void verror (int __status, int __errnum, const char *__format,
va_list __args)
- __attribute__ ((__format__ (__printf__, 3, 0)));
+ _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));

/* Print a message with `vfprintf (stderr, FORMAT, ARGS)';
if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
@@ -44,7 +45,7 @@ extern void verror (int __status, int __
extern void verror_at_line (int __status, int __errnum, const char *__fname,
unsigned int __lineno, const char *__format,
va_list __args)
- __attribute__ ((__format__ (__printf__, 5, 0)));
+ _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 0));

#ifdef __cplusplus
}

0 comments on commit 60acf5e

Please sign in to comment.