Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/80876c7ae0c7cc58b8f103b35cf422efa19c7e50
...commit
http://git.netsurf-browser.org/toolchains.git/commit/80876c7ae0c7cc58b8f103b35cf422efa19c7e50
...tree
http://git.netsurf-browser.org/toolchains.git/tree/80876c7ae0c7cc58b8f103b35cf422efa19c7e50
The branch, chris/amissl has been updated
via 80876c7ae0c7cc58b8f103b35cf422efa19c7e50 (commit)
from 32cb94f59525f4b9ccfdf80111dc857bfdea1a41 (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=80876c7ae0c7cc58b8f103b35cf422efa19c7e50
commit 80876c7ae0c7cc58b8f103b35cf422efa19c7e50
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix ppc-amigaos libcurl 7.64.1 build
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
index 9833c94..5243fc5 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
@@ -1,11 +1,20 @@
---- lib/amigaos.c.old 2012-10-19 21:37:45.000000000 +0100
-+++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100
-@@ -22,7 +22,7 @@
+--- lib/amigaos.c 2019-03-25 08:42:50.000000000 +0000
++++ lib/amigaos.c 2019-03-30 12:49:06.680985341 +0000
+@@ -24,7 +24,7 @@
- #include "curl_setup.h"
+ #ifdef __AMIGA__
+ # include "amigaos.h"
+-# if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)
++# if 0
+ # include <amitcp/socketbasetags.h>
+ # endif
+ # ifdef __libnix__
+@@ -37,7 +37,7 @@
+ #include "memdebug.h"
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
-
- #include <amitcp/socketbasetags.h>
+ #ifdef __AMIGA__
+-#if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)
++#if 0
+ struct Library *SocketBase = NULL;
+ extern int errno, h_errno;
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
index 050bea7..2f62a1c 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
@@ -1,11 +1,11 @@
---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100
-+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100
+--- lib/amigaos.h 2019-03-25 08:42:50.000000000 +0000
++++ lib/amigaos.h 2019-03-30 12:49:50.744493740 +0000
@@ -23,7 +23,7 @@
***************************************************************************/
#include "curl_setup.h"
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
+-#if defined(__AMIGA__) && defined(HAVE_BSDSOCKET_H) && !defined(USE_AMISSL)
++#if 0
bool Curl_amiga_init();
void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
index 7e47a50..0e52d73 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
@@ -1,23 +1,12 @@
---- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100
-+++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100
-@@ -323,11 +323,15 @@
-
- #ifdef __AMIGA__
- # ifndef __ixemul__
--# include <exec/types.h>
--# include <exec/execbase.h>
--# include <proto/exec.h>
--# include <proto/dos.h>
--# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+# ifdef __amigaos4__
-+# include <unistd.h>
-+# else
-+# include <exec/types.h>
-+# include <exec/execbase.h>
-+# include <proto/exec.h>
-+# include <proto/dos.h>
-+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+# endif
+--- lib/curl_setup.h 2019-03-30 13:44:08.576270700 +0000
++++ lib/curl_setup.h 2019-03-30 13:44:33.011975643 +0000
+@@ -314,7 +314,8 @@
+ # include <exec/execbase.h>
+ # include <proto/exec.h>
+ # include <proto/dos.h>
+-# ifdef HAVE_PROTO_BSDSOCKET_H
++# define HAVE_SELECT 1
++# if 0
+ # include <proto/bsdsocket.h> /* ensure bsdsocket.library use */
+ # define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
# endif
- #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 6237496..4c9a726 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,26 +1,11 @@
---- 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"
-
- #define ENABLE_CURLX_PRINTF
-@@ -1856,9 +1860,9 @@
- #ifdef __AMIGA__
- if(!result && outs.s_isreg && outs.filename) {
+--- src/tool_operate.c 2019-03-30 12:33:41.315465662 +0000
++++ src/tool_operate.c 2019-03-30 12:42:36.643382219 +0000
+@@ -1872,7 +1872,7 @@ static CURLcode operate_do(struct Global
/* Set the url (up to 80 chars) as comment for the file */
-- if(strlen(url) > 78)
-- url[79] = '\0';
-- SetComment(outs.filename, url);
-+ if(strlen(urlnode->url) > 78)
-+ urlnode->url[79] = '\0';
-+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header
to include that provides this function */
+ if(strlen(urlnode->url) > 78)
+ urlnode->url[79] = '\0';
+- SetComment(outs.filename, urlnode->url);
++ IDOS->SetComment(outs.filename, urlnode->url);
}
#endif
-----------------------------------------------------------------------
Summary of changes:
.../patches/libcurl/ppc-amigaos/lib.amigaos.c.p | 25 ++++++++++-----
.../patches/libcurl/ppc-amigaos/lib.amigaos.h.p | 8 ++---
.../patches/libcurl/ppc-amigaos/lib.curl_setup.h.p | 33 +++++++-------------
.../libcurl/ppc-amigaos/src.tool_operate.c.p | 29 +++++------------
4 files changed, 39 insertions(+), 56 deletions(-)
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
index 9833c94..5243fc5 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p
@@ -1,11 +1,20 @@
---- lib/amigaos.c.old 2012-10-19 21:37:45.000000000 +0100
-+++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100
-@@ -22,7 +22,7 @@
+--- lib/amigaos.c 2019-03-25 08:42:50.000000000 +0000
++++ lib/amigaos.c 2019-03-30 12:49:06.680985341 +0000
+@@ -24,7 +24,7 @@
- #include "curl_setup.h"
+ #ifdef __AMIGA__
+ # include "amigaos.h"
+-# if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)
++# if 0
+ # include <amitcp/socketbasetags.h>
+ # endif
+ # ifdef __libnix__
+@@ -37,7 +37,7 @@
+ #include "memdebug.h"
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
-
- #include <amitcp/socketbasetags.h>
+ #ifdef __AMIGA__
+-#if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL)
++#if 0
+ struct Library *SocketBase = NULL;
+ extern int errno, h_errno;
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
index 050bea7..2f62a1c 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
@@ -1,11 +1,11 @@
---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100
-+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100
+--- lib/amigaos.h 2019-03-25 08:42:50.000000000 +0000
++++ lib/amigaos.h 2019-03-30 12:49:50.744493740 +0000
@@ -23,7 +23,7 @@
***************************************************************************/
#include "curl_setup.h"
--#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
+-#if defined(__AMIGA__) && defined(HAVE_BSDSOCKET_H) && !defined(USE_AMISSL)
++#if 0
bool Curl_amiga_init();
void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
index 7e47a50..0e52d73 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p
@@ -1,23 +1,12 @@
---- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100
-+++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100
-@@ -323,11 +323,15 @@
-
- #ifdef __AMIGA__
- # ifndef __ixemul__
--# include <exec/types.h>
--# include <exec/execbase.h>
--# include <proto/exec.h>
--# include <proto/dos.h>
--# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+# ifdef __amigaos4__
-+# include <unistd.h>
-+# else
-+# include <exec/types.h>
-+# include <exec/execbase.h>
-+# include <proto/exec.h>
-+# include <proto/dos.h>
-+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
-+# endif
+--- lib/curl_setup.h 2019-03-30 13:44:08.576270700 +0000
++++ lib/curl_setup.h 2019-03-30 13:44:33.011975643 +0000
+@@ -314,7 +314,8 @@
+ # include <exec/execbase.h>
+ # include <proto/exec.h>
+ # include <proto/dos.h>
+-# ifdef HAVE_PROTO_BSDSOCKET_H
++# define HAVE_SELECT 1
++# if 0
+ # include <proto/bsdsocket.h> /* ensure bsdsocket.library use */
+ # define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
# endif
- #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 6237496..4c9a726 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,26 +1,11 @@
---- 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"
-
- #define ENABLE_CURLX_PRINTF
-@@ -1856,9 +1860,9 @@
- #ifdef __AMIGA__
- if(!result && outs.s_isreg && outs.filename) {
+--- src/tool_operate.c 2019-03-30 12:33:41.315465662 +0000
++++ src/tool_operate.c 2019-03-30 12:42:36.643382219 +0000
+@@ -1872,7 +1872,7 @@ static CURLcode operate_do(struct Global
/* Set the url (up to 80 chars) as comment for the file */
-- if(strlen(url) > 78)
-- url[79] = '\0';
-- SetComment(outs.filename, url);
-+ if(strlen(urlnode->url) > 78)
-+ urlnode->url[79] = '\0';
-+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header
to include that provides this function */
+ if(strlen(urlnode->url) > 78)
+ urlnode->url[79] = '\0';
+- SetComment(outs.filename, urlnode->url);
++ IDOS->SetComment(outs.filename, urlnode->url);
}
#endif
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
