diff options
| author | obache <obache@pkgsrc.org> | 2014-06-29 06:53:23 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-06-29 06:53:23 +0000 |
| commit | dd1bc5ea35ed9ea11f7e849405dd0fb13572924d (patch) | |
| tree | 80c1dc421e5abbe05add556820a51fb445d6e5b8 /sysutils/coreutils | |
| parent | e2db5e6d86425433b7c57840ba79f3d530a1a048 (diff) | |
| download | pkgsrc-dd1bc5ea35ed9ea11f7e849405dd0fb13572924d.tar.gz | |
Add an patch for nested include of string.h.
Fixes build failure on NetBSD-6.
Diffstat (limited to 'sysutils/coreutils')
| -rw-r--r-- | sysutils/coreutils/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/coreutils/patches/patch-lib_string.in.h | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo index 35651830a2c..55de15bc1f1 100644 --- a/sysutils/coreutils/distinfo +++ b/sysutils/coreutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2014/04/03 13:02:59 obache Exp $ +$NetBSD: distinfo,v 1.29 2014/06/29 06:53:23 obache Exp $ SHA1 (coreutils-8.22.tar.xz) = cc7fe47b21eb49dd2ee4cdb707570f42fb2c8cc6 RMD160 (coreutils-8.22.tar.xz) = c3da7ade1d3ac82e97ac4a24c70376af8b9b503b @@ -6,3 +6,4 @@ Size (coreutils-8.22.tar.xz) = 5335124 bytes SHA1 (patch-Makefile.in) = fce694c56777081a6a54d157dd0573945250f381 SHA1 (patch-lib-fflush.c) = 106e9c7d05fff290f24cb69e1b2c80d0077c62bd SHA1 (patch-lib-fseeko.c) = 9f4b0294698648011c64869fc0e642f910e9d47f +SHA1 (patch-lib_string.in.h) = 37167af962d1cfe9196d11e4250d9e9628d9eb73 diff --git a/sysutils/coreutils/patches/patch-lib_string.in.h b/sysutils/coreutils/patches/patch-lib_string.in.h new file mode 100644 index 00000000000..4f5f0f646ec --- /dev/null +++ b/sysutils/coreutils/patches/patch-lib_string.in.h @@ -0,0 +1,33 @@ +$NetBSD: patch-lib_string.in.h,v 1.1 2014/06/29 06:53:23 obache Exp $ + +* fixes for nested include of string.h. + +--- lib/string.in.h.orig 2013-12-04 15:02:02.000000000 +0000 ++++ lib/string.in.h +@@ -15,6 +15,10 @@ + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. */ + ++#ifdef GL_ALREADY_INCLUDE_STRING_H ++#@INCLUDE_NEXT@ @NEXT_STRING_H@ ++#else ++ + #ifndef _@GUARD_PREFIX@_STRING_H + + #if __GNUC__ >= 3 +@@ -22,8 +26,10 @@ + #endif + @PRAGMA_COLUMNS@ + ++#define GL_ALREADY_INCLUDE_STRING_H + /* The include_next requires a split double-inclusion guard. */ + #@INCLUDE_NEXT@ @NEXT_STRING_H@ ++#undef GL_ALREADY_INCLUDE_STRING_H + + #ifndef _@GUARD_PREFIX@_STRING_H + #define _@GUARD_PREFIX@_STRING_H +@@ -1027,3 +1033,4 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp + + #endif /* _@GUARD_PREFIX@_STRING_H */ + #endif /* _@GUARD_PREFIX@_STRING_H */ ++#endif |