Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/eb01b89e3e2cd6f74053b825cd1a31e07a60dd36
...commit
http://git.netsurf-browser.org/toolchains.git/commit/eb01b89e3e2cd6f74053b825cd1a31e07a60dd36
...tree
http://git.netsurf-browser.org/toolchains.git/tree/eb01b89e3e2cd6f74053b825cd1a31e07a60dd36
The branch, master has been updated
via eb01b89e3e2cd6f74053b825cd1a31e07a60dd36 (commit)
via 042c35930cc063b68b646765d633d7ffd99fc519 (commit)
from 3b27b283d9f4dd4fcdf0c5c0da40322d9d5e7582 (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=eb01b89e3e2cd6f74053b825cd1a31e07a60dd36
commit eb01b89e3e2cd6f74053b825cd1a31e07a60dd36
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix Curl build for m68k-unknown-amigaos
This patch shouldn't be needed; this needs fixing upstream
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
new file mode 100644
index 0000000..b0feb48
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
@@ -0,0 +1,18 @@
+--- 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
+ }
+ }
+
+-#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) && (CURL_SIZEOF_CURL_OFF_T >= 8))
+ /* File time can only be set _after_ the file has been closed */
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=042c35930cc063b68b646765d633d7ffd99fc519
commit 042c35930cc063b68b646765d633d7ffd99fc519
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix OpenSSL build for m68k-unknown-amigaos
diff --git
a/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
b/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
index cd3f236..3c18b7d 100644
--- a/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
+++ b/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
@@ -39,8 +39,15 @@
/* OS3 has a different but compatible TimeVal definition */
struct TimeVal
{
- uint32 Seconds;
- uint32 Microseconds;
+ ULONG Seconds;
+ ULONG Microseconds;
+};
+
+/* ...and ditto for TimeRequest */
+struct TimeRequest
+{
+ struct IORequest Request;
+ struct TimeVal Time;
};
#endif /* !__amigaos4__ */
-----------------------------------------------------------------------
Summary of changes:
.../openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c | 11 +++++++++--
.../src.tool_operate.c.p | 0
2 files changed, 9 insertions(+), 2 deletions(-)
copy sdk/recipes/patches/libcurl/{ppc-amigaos =>
m68k-unknown-amigaos}/src.tool_operate.c.p (100%)
diff --git
a/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
b/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
index cd3f236..3c18b7d 100644
--- a/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
+++ b/sdk/recipes/files/openssl/m68k-unknown-amigaos/crypto/rand/rand_amiga.c
@@ -39,8 +39,15 @@
/* OS3 has a different but compatible TimeVal definition */
struct TimeVal
{
- uint32 Seconds;
- uint32 Microseconds;
+ ULONG Seconds;
+ ULONG Microseconds;
+};
+
+/* ...and ditto for TimeRequest */
+struct TimeRequest
+{
+ struct IORequest Request;
+ struct TimeVal Time;
};
#endif /* !__amigaos4__ */
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
similarity index 100%
copy from sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
copy to sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
