Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/1e47ceadd2b4343b5b... ...commit http://git.netsurf-browser.org/toolchains.git/commit/1e47ceadd2b4343b5b35... ...tree http://git.netsurf-browser.org/toolchains.git/tree/1e47ceadd2b4343b5b3520... The branch, master has been updated via 1e47ceadd2b4343b5b35201b95f7e3467141e9f3 (commit) from b2cae1faab8a5e614519d774b602d9578d3eb1e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=1e47ceadd2b4343b... commit 1e47ceadd2b4343b5b35201b95f7e3467141e9f3 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix AmigaOS iconv/curl builds after update diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p deleted file mode 100644 index 945f8a5..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ - } - } - --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -- } --#endif -- - #ifdef HAVE_UTIME - /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p index 9a2b590..b6287ca 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p @@ -1,6 +1,6 @@ ---- lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100 -+++ lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000 -@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c +--- lib/hostip4.c 2017-03-26 23:41:52.304617207 +0100 ++++ lib/hostip4.c 2017-03-26 23:41:11.000000000 +0100 +@@ -119,6 +119,10 @@ Curl_addrinfo *Curl_getaddrinfo(struct c * implying that only threadsafe code and function calls may be used. * */ @@ -8,11 +8,10 @@ +#include <proto/exec.h> +#include <proto/bsdsocket.h> +#endif -+ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, int port) { -@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -129,6 +133,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const struct hostent *h = NULL; struct in_addr in; struct hostent *buf = NULL; @@ -22,7 +21,7 @@ if(Curl_inet_pton(AF_INET, hostname, &in) > 0) /* This is a dotted IP address 123.123.123.123-style */ -@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -291,7 +298,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const * gethostbyname() is the preferred one. */ else { @@ -38,12 +37,12 @@ + h = ISocket->gethostbyname((void*)hostname); + } +#else - h = gethostbyname((void*)hostname); -+#endif + h = gethostbyname((void *)hostname); ++#endif #endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */ } -@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -301,7 +321,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const if(buf) /* used a *_r() function */ free(buf); } diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p index 945f8a5..b0feb48 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ +--- src/tool_operate.c 2017-02-23 22:14:58.000000000 +0000 ++++ src/tool_operate.c 2017-03-26 23:54:19.624614960 +0100 +@@ -1742,15 +1742,6 @@ static CURLcode operate_do(struct Global } } @@ -13,6 +13,6 @@ - } -#endif - - #ifdef HAVE_UTIME + #if defined(HAVE_UTIME) || \ + (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { 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/ppc-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p new file mode 100644 index 0000000..3d7938d --- /dev/null +++ b/sdk/recipes/patches/libiconv/ppc-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/ppc-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p index 93ee6a9..8647b83 100644 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p +++ b/sdk/recipes/patches/libiconv/ppc-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/ppc-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p deleted file mode 100644 index eecac92..0000000 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 @@ - #endif - - --#if @GNULIB_READLINK@ --/* 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>;. */ --# if @REPLACE_READLINK@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# define readlink rpl_readlink --# endif --_GL_FUNCDECL_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --_GL_CXXALIAS_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# else --# if !@HAVE_READLINK@ --_GL_FUNCDECL_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --# endif --_GL_CXXALIAS_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# endif --_GL_CXXALIASWARN (readlink); --#elif defined GNULIB_POSIXCHECK --# undef readlink --# if HAVE_RAW_DECL_READLINK --_GL_WARN_ON_USE (readlink, "readlink is unportable - " -- "use gnulib module readlink for portability"); --# endif --#endif -- -- - #if @GNULIB_READLINKAT@ - # if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, ----------------------------------------------------------------------- Summary of changes: .../m68k-unknown-amigaos/src.tool_operate.c.p | 18 -------- .../patches/libcurl/ppc-amigaos/lib.hostip4.c.p | 17 ++++---- .../libcurl/ppc-amigaos/src.tool_operate.c.p | 10 ++--- .../m68k-unknown-amigaos/srclib.getprogname.c.p | 11 +++++ .../m68k-unknown-amigaos/srclib.signal.in.h.p | 20 ++++----- .../libiconv/ppc-amigaos/srclib.getprogname.c.p | 11 +++++ .../libiconv/ppc-amigaos/srclib.signal.in.h.p | 20 ++++----- .../libiconv/ppc-amigaos/srclib.unistd.in.h.p | 43 -------------------- 8 files changed, 55 insertions(+), 95 deletions(-) delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p create mode 100644 sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p create mode 100644 sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p delete mode 100644 sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p deleted file mode 100644 index 945f8a5..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ - } - } - --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -- } --#endif -- - #ifdef HAVE_UTIME - /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p index 9a2b590..b6287ca 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p @@ -1,6 +1,6 @@ ---- lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100 -+++ lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000 -@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c +--- lib/hostip4.c 2017-03-26 23:41:52.304617207 +0100 ++++ lib/hostip4.c 2017-03-26 23:41:11.000000000 +0100 +@@ -119,6 +119,10 @@ Curl_addrinfo *Curl_getaddrinfo(struct c * implying that only threadsafe code and function calls may be used. * */ @@ -8,11 +8,10 @@ +#include <proto/exec.h> +#include <proto/bsdsocket.h> +#endif -+ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, int port) { -@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -129,6 +133,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const struct hostent *h = NULL; struct in_addr in; struct hostent *buf = NULL; @@ -22,7 +21,7 @@ if(Curl_inet_pton(AF_INET, hostname, &in) > 0) /* This is a dotted IP address 123.123.123.123-style */ -@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -291,7 +298,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const * gethostbyname() is the preferred one. */ else { @@ -38,12 +37,12 @@ + h = ISocket->gethostbyname((void*)hostname); + } +#else - h = gethostbyname((void*)hostname); -+#endif + h = gethostbyname((void *)hostname); ++#endif #endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */ } -@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const +@@ -301,7 +321,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const if(buf) /* used a *_r() function */ free(buf); } diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p index 945f8a5..b0feb48 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ +--- src/tool_operate.c 2017-02-23 22:14:58.000000000 +0000 ++++ src/tool_operate.c 2017-03-26 23:54:19.624614960 +0100 +@@ -1742,15 +1742,6 @@ static CURLcode operate_do(struct Global } } @@ -13,6 +13,6 @@ - } -#endif - - #ifdef HAVE_UTIME + #if defined(HAVE_UTIME) || \ + (defined(WIN32) && (CURL_SIZEOF_CURL_OFF_T >= 8)) /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { 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/ppc-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p new file mode 100644 index 0000000..3d7938d --- /dev/null +++ b/sdk/recipes/patches/libiconv/ppc-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/ppc-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p index 93ee6a9..8647b83 100644 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p +++ b/sdk/recipes/patches/libiconv/ppc-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/ppc-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p deleted file mode 100644 index eecac92..0000000 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 @@ - #endif - - --#if @GNULIB_READLINK@ --/* 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>;. */ --# if @REPLACE_READLINK@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# define readlink rpl_readlink --# endif --_GL_FUNCDECL_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --_GL_CXXALIAS_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# else --# if !@HAVE_READLINK@ --_GL_FUNCDECL_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --# endif --_GL_CXXALIAS_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# endif --_GL_CXXALIASWARN (readlink); --#elif defined GNULIB_POSIXCHECK --# undef readlink --# if HAVE_RAW_DECL_READLINK --_GL_WARN_ON_USE (readlink, "readlink is unportable - " -- "use gnulib module readlink for portability"); --# endif --#endif -- -- - #if @GNULIB_READLINKAT@ - # if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, -- Cross-compilation toolchains and environments