diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/distinfo | 4 | ||||
| -rw-r--r-- | math/octave/patches/patch-libgnu_string.in.h | 29 |
2 files changed, 28 insertions, 5 deletions
diff --git a/math/octave/distinfo b/math/octave/distinfo index aadf63f04be..85a12edeab1 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: distinfo,v 1.46 2016/03/01 20:13:19 joerg Exp $ SHA1 (octave-4.0.0.tar.xz) = 795c7ef1fb8d92f4cf9cae9eabba374a0328b1a9 RMD160 (octave-4.0.0.tar.xz) = 57a4c6a90fbe49ad5268b257a4847788061daa49 @@ -9,7 +9,7 @@ SHA1 (patch-configure.ac) = d70f77d12a660bf9542725c8085fb525f138ce75 SHA1 (patch-fflush-fpos_t.c) = 83d3d731042862920de68f0457fea4f95568125c SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c SHA1 (patch-libgnu_stdio.in.h) = 9b01e1e131b39ef69607387adefc679e0e11d653 -SHA1 (patch-libgnu_string.in.h) = b7b48879d0aa465f5492d2213e5782eb71b4c744 +SHA1 (patch-libgnu_string.in.h) = feac8dd3c9873d93918f9b5810c28a80f953a80a SHA1 (patch-libgui_graphics_Canvas.cc) = b8161fc9248af2160c6fea012bac85e2128dbad7 SHA1 (patch-libgui_graphics_Object.cc) = f0c0064793d4650e845e217806597bb956cb49fd SHA1 (patch-libgui_qterminal_libqterminal_QTerminal.cc) = 48827b415a142518a6d764f670db0ce640cf4da4 diff --git a/math/octave/patches/patch-libgnu_string.in.h b/math/octave/patches/patch-libgnu_string.in.h index a089878d881..4a5bdf90ebe 100644 --- a/math/octave/patches/patch-libgnu_string.in.h +++ b/math/octave/patches/patch-libgnu_string.in.h @@ -1,8 +1,26 @@ -$NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgnu_string.in.h,v 1.3 2016/03/01 20:13:19 joerg Exp $ + +The "split" include guards fails miserable on NetBSD since by default +string.h will include strings.h, which goes back to string.h. Now due to +the lovely magic here, the rest of the file will be processed before the +real header. --- libgnu/string.in.h.orig 2015-05-23 14:36:17.000000000 +0000 +++ libgnu/string.in.h -@@ -184,6 +184,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un +@@ -22,11 +22,8 @@ + #endif + @PRAGMA_COLUMNS@ + +-/* The include_next requires a split double-inclusion guard. */ +-#@INCLUDE_NEXT@ @NEXT_STRING_H@ +- +-#ifndef _@GUARD_PREFIX@_STRING_H + #define _@GUARD_PREFIX@_STRING_H ++#@INCLUDE_NEXT@ @NEXT_STRING_H@ + + /* NetBSD 5.0 mis-defines NULL. */ + #include <stddef.h> +@@ -184,6 +181,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un #endif /* Search backwards through a block for a byte (specified as an int). */ @@ -15,7 +33,7 @@ $NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) -@@ -210,6 +216,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un +@@ -210,6 +213,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un "use gnulib module memrchr for portability"); # endif #endif @@ -23,3 +41,8 @@ $NetBSD: patch-libgnu_string.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ /* Find the first occurrence of C in S. More efficient than memchr(S,C,N), at the expense of undefined behavior if C does not +@@ -1026,4 +1030,3 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp + + + #endif /* _@GUARD_PREFIX@_STRING_H */ +-#endif /* _@GUARD_PREFIX@_STRING_H */ |