diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-08-08 17:33:20 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-08-08 17:33:20 +0100 |
commit | 893d5d1f193af671dc30d9a023f0986932ce8e20 (patch) | |
tree | 070afc4d369e639be890fac973a578b9c182731c /sdk/recipes/patches/libiconv/m68k-unknown-amigaos | |
parent | 3da666dfb511af5c936e2f253e0ea8c3e22a7a30 (diff) | |
parent | a6cd4d1e9f3ac2eb6e729c20b589227549eba42e (diff) | |
download | toolchains-chris/http2.tar.gz toolchains-chris/http2.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/toolchains into chris/http2chris/http2
Diffstat (limited to 'sdk/recipes/patches/libiconv/m68k-unknown-amigaos')
3 files changed, 28 insertions, 17 deletions
diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p new file mode 100644 index 0000000..3d7938d --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p @@ -0,0 +1,11 @@ +--- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000 ++++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100 +@@ -144,7 +144,7 @@ getprogname (void) + } + return p; + # else +-# error "getprogname module not ported to this OS" ++ const char *p = ""; /* this is never used for anything important */ + # endif + } + diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p index 93ee6a9..8647b83 100644 --- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p @@ -1,12 +1,12 @@ ---- srclib/signal.in.h.orig 2011-08-07 14:42:06.000000000 +0100 -+++ srclib/signal.in.h 2014-01-15 00:57:27.620548058 +0000 -@@ -168,69 +168,6 @@ - - # endif +--- srclib/signal.in.h 2017-01-01 23:02:22.000000000 +0000 ++++ srclib/signal.in.h 2017-03-26 22:56:18.360017409 +0100 +@@ -211,69 +211,6 @@ typedef int verify_NSIG_constraint[NSIG + # undef sigismember + #endif -/* Test whether a given signal is contained in a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigismember -# endif @@ -19,7 +19,7 @@ - -/* Initialize a signal set to the empty set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigemptyset -# endif @@ -31,7 +31,7 @@ - -/* Add a signal to a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigaddset -# endif @@ -44,7 +44,7 @@ - -/* Remove a signal from a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigdelset -# endif @@ -57,7 +57,7 @@ - -/* Fill a signal set with all possible signals. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigfillset -# endif diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p index eecac92..2e1cf5e 100644 --- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p @@ -1,6 +1,6 @@ ---- srclib/unistd.in.h.orig 2014-01-15 01:06:20.525844246 +0000 -+++ srclib/unistd.in.h 2014-01-15 01:06:48.717471325 +0000 -@@ -1145,40 +1145,6 @@ +--- srclib/unistd.in.h.orig 2017-03-27 23:12:52.149619622 +0100 ++++ srclib/unistd.in.h 2017-03-27 23:13:12.582243962 +0100 +@@ -1262,40 +1262,6 @@ #endif @@ -8,8 +8,8 @@ -/* Read the contents of the symbolic link FILE and place the first BUFSIZE - bytes of it into BUF. Return the number of bytes placed into BUF if - successful, otherwise -1 and errno set. -- See the POSIX:2001 specification -- <http://www.opengroup.org/susv3xsh/readlink.html>. */ +- See the POSIX:2008 specification +- <http://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>. */ -# if @REPLACE_READLINK@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define readlink rpl_readlink @@ -39,5 +39,5 @@ - - #if @GNULIB_READLINKAT@ - # if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, + # if @REPLACE_READLINKAT@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |