diff options
author | Vincent Sanders <vince@kyllikki.org> | 2019-02-14 14:23:27 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2019-02-14 14:23:27 +0000 |
commit | 291a9eacae205da9f699e72550d152e016dc8a89 (patch) | |
tree | db65f2a49b85c1e2c21ab7a4cc92d40205cf0c74 | |
parent | ebbf82001a80cff52e847a6b8bd716701e972218 (diff) | |
download | toolchains-291a9eacae205da9f699e72550d152e016dc8a89.tar.gz toolchains-291a9eacae205da9f699e72550d152e016dc8a89.tar.bz2 |
fix remaining ppc-amigaos SDK build faliures
3 files changed, 58 insertions, 28 deletions
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 index 024cf92..6237496 100644 --- 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 @@ -1,18 +1,26 @@ ---- src/tool_operate.c.orig 2018-01-26 13:44:37.960724591 +0000 -+++ src/tool_operate.c 2018-01-26 13:44:48.385035073 +0000 -@@ -1832,15 +1832,6 @@ - } - } +--- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 ++++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 +@@ -33,6 +33,10 @@ + # include <fabdef.h> + #endif + ++#ifdef __AMIGA__ ++#include <proto/dos.h> ++#endif ++ + #include "strcase.h" --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ + #define ENABLE_CURLX_PRINTF +@@ -1856,9 +1860,9 @@ + #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 -- - #if defined(HAVE_UTIME) || \ - (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) - /* File time can only be set _after_ the file has been closed */ ++ if(strlen(urlnode->url) > 78) ++ urlnode->url[79] = '\0'; ++ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ + } + #endif + 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 024cf92..6237496 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,18 +1,26 @@ ---- src/tool_operate.c.orig 2018-01-26 13:44:37.960724591 +0000 -+++ src/tool_operate.c 2018-01-26 13:44:48.385035073 +0000 -@@ -1832,15 +1832,6 @@ - } - } +--- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 ++++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 +@@ -33,6 +33,10 @@ + # include <fabdef.h> + #endif + ++#ifdef __AMIGA__ ++#include <proto/dos.h> ++#endif ++ + #include "strcase.h" --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ + #define ENABLE_CURLX_PRINTF +@@ -1856,9 +1860,9 @@ + #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 -- - #if defined(HAVE_UTIME) || \ - (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) - /* File time can only be set _after_ the file has been closed */ ++ if(strlen(urlnode->url) > 78) ++ urlnode->url[79] = '\0'; ++ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ + } + #endif + diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p new file mode 100644 index 0000000..a5fa68a --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p @@ -0,0 +1,14 @@ +--- test/rsa_complex.c.orig 2019-02-14 10:16:06.665734720 +0000 ++++ test/rsa_complex.c 2019-02-14 10:16:18.581682332 +0000 +@@ -12,11 +12,6 @@ + * The former defines "I" as a macro and earlier versions of the latter use + * for function arguments. + */ +-#if defined(__STDC_VERSION__) +-# if __STDC_VERSION__ >= 199901L +-# include <complex.h> +-# endif +-#endif + #include <openssl/rsa.h> + #include <stdlib.h> + |