Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/65ef05d3ff8daaff5c263a32f0da4dd01529c690
...commit
http://git.netsurf-browser.org/toolchains.git/commit/65ef05d3ff8daaff5c263a32f0da4dd01529c690
...tree
http://git.netsurf-browser.org/toolchains.git/tree/65ef05d3ff8daaff5c263a32f0da4dd01529c690
The branch, chris/sdk-5334 has been created
at 65ef05d3ff8daaff5c263a32f0da4dd01529c690 (commit)
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=65ef05d3ff8daaff5c263a32f0da4dd01529c690
commit 65ef05d3ff8daaff5c263a32f0da4dd01529c690
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
ppc-amigaos: Fix libcurl build
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/configure.p
b/sdk/recipes/patches/libcurl/ppc-amigaos/configure.p
new file mode 100644
index 0000000..91bf677
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/configure.p
@@ -0,0 +1,13 @@
+--- configure 2022-01-04 11:43:20.490235234 +0000
++++ configure 2022-01-04 11:56:40.357605123 +0000
+@@ -44201,9 +44201,7 @@ fi
+
+ if test "$USE_THREADS_POSIX" != "1"
+ then
+- CFLAGS="$CFLAGS -pthread"
+- # assign PTHREAD for pkg-config use
+- PTHREAD=" -pthread"
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create
in -lpthread" >&5
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ if ${ac_cv_lib_pthread_pthread_create+:} false; then :
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 0e52d73..b0c6404 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,9 +1,9 @@
---- 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>
+--- lib/curl_setup.h 2022-01-04 10:53:18.770467711 +0000
++++ lib/curl_setup.h 2022-01-04 10:54:58.216791681 +0000
+@@ -286,7 +286,8 @@
# include <proto/exec.h>
# include <proto/dos.h>
+ # include <unistd.h>
-# ifdef HAVE_PROTO_BSDSOCKET_H
+# define HAVE_SELECT 1
+# if 0
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 39952b8..8d3ffa1 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 2020-01-05 09:50:51.000000000 +0000
-+++ lib/hostip4.c 2020-05-07 16:02:59.313823259 +0100
-@@ -120,6 +120,10 @@ Curl_addrinfo *Curl_getaddrinfo(struct c
+--- lib/hostip4.c 2022-01-04 10:57:27.790270827 +0000
++++ lib/hostip4.c 2022-01-04 11:01:43.125967497 +0000
+@@ -120,6 +120,10 @@ struct Curl_addrinfo *Curl_getaddrinfo(s
* implying that only threadsafe code and function calls may be used.
*
*/
@@ -8,23 +8,23 @@
+#include <proto/exec.h>
+#include <proto/bsdsocket.h>
+#endif
- Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
- int port)
+ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
+ int port)
{
-@@ -130,6 +134,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+@@ -129,6 +133,9 @@ struct Curl_addrinfo *Curl_ipv4_resolve_
+ struct Curl_addrinfo *ai = NULL;
struct hostent *h = NULL;
- struct in_addr in;
struct hostent *buf = NULL;
+#ifdef __amigaos4__
+ struct SocketIFace *ISocket = NULL;
+#endif
- #ifdef ENABLE_IPV6
- {
-@@ -302,7 +309,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
- * gethostbyname() is the preferred one.
- */
- else {
+ #if defined(HAVE_GETADDRINFO_THREADSAFE)
+ struct addrinfo hints;
+@@ -284,7 +291,20 @@ struct Curl_addrinfo *Curl_ipv4_resolve_
+ * getaddrinfo() nor gethostbyname_r() function or for which
+ * gethostbyname() is the preferred one.
+ */
+#ifdef __amigaos4__
+ struct Library *SocketBase = IExec->OpenLibrary("bsdsocket.library", 4);
+ if (SocketBase)
@@ -36,17 +36,16 @@
+ {
+ h = ISocket->gethostbyname((void*)hostname);
+ }
-+#else
- h = gethostbyname((void *)hostname);
++#else
+ h = gethostbyname((void *)hostname);
+#endif
#endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */
- }
-@@ -312,7 +332,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
- if(buf) /* used a *_r() function */
+ if(h) {
+@@ -294,6 +314,14 @@ struct Curl_addrinfo *Curl_ipv4_resolve_
free(buf);
}
--
+
+#ifdef __amigaos4__
+ if (ISocket)
+ {
@@ -54,7 +53,7 @@
+ IExec->DropInterface((struct Interface *)ISocket);
+ IExec->CloseLibrary(SocketBase);
+ }
-+#endif
++#endif
return ai;
}
#endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) */
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=107e45072a2bf934494644442541b378c5fbfcb9
commit 107e45072a2bf934494644442541b378c5fbfcb9
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
ppc-amigaos: Update SDK to v53.34
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index b6f8eef..ae2fa8b 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -18,11 +18,8 @@ UPSTREAM_MPC_VERSION := 1.0.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_NDK_TARBALL := SDK_53.29.lha
-UPSTREAM_NDK_URI :=
"http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=82";
-
-UPSTREAM_NDK_UPDATE_TARBALL := SDK_addon_final_edition_update2.zip
-UPSTREAM_NDK_UPDATE_URI :=
http://kas1e.mikendezign.com/aos4/SDK_addon_final_edition_update2.zip
+UPSTREAM_NDK_TARBALL := SDK_53.34.lha
+UPSTREAM_NDK_URI :=
"http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=125";
UPSTREAM_OPENURL_VERSION := 7.16
UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION).tar.gz
@@ -92,26 +89,26 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(
# Rules to install the NDK
###
-$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
mkdir -p $(BUILDDIR)/ndk/tmp/
lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.30.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.62.lha
lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.206.lha
- lha xw=$(BUILDDIR)/ndk/tmp
$(BUILDDIR)/ndk/SDK_Install/pthreads-53.11.lha
+ lha xw=$(BUILDDIR)/ndk/tmp
$(BUILDDIR)/ndk/SDK_Install/pthreads-53.12.lha
+ lha xw=$(BUILDDIR)/ndk/tmp
$(BUILDDIR)/ndk/SDK_Install/execsg_sdk-54.26.lha
lha xw=$(BUILDDIR)/ndk/tmp $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK
- unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d
$(BUILDDIR)/ndk/tmp
- cp -r $(BUILDDIR)/ndk/tmp/Include $(PREFIX)/$(TARGET_NAME)/SDK/include
- cp -r $(BUILDDIR)/ndk/tmp/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib
- cp -r $(BUILDDIR)/ndk/tmp/clib2 $(PREFIX)/$(TARGET_NAME)/SDK/clib2
+ mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK/include
+ mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK/newlib
+ mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK/clib2
+ cp -r $(BUILDDIR)/ndk/tmp/Include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/
+ cp -r $(BUILDDIR)/ndk/tmp/newlib/* $(PREFIX)/$(TARGET_NAME)/SDK/newlib/
+ cp -r $(BUILDDIR)/ndk/tmp/clib2/* $(PREFIX)/$(TARGET_NAME)/SDK/clib2/
cp -r $(BUILDDIR)/ndk/tmp/Local/common/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/newlib/include/
cp -r $(BUILDDIR)/ndk/tmp/Local/newlib/lib/*
$(PREFIX)/$(TARGET_NAME)/SDK/newlib/lib/
- cp -r $(BUILDDIR)/ndk/tmp/SDK/Include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include
- cp -r $(BUILDDIR)/ndk/tmp/SDK/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib
- cp -r $(BUILDDIR)/ndk/tmp/SDK/local/newlib/lib/*
$(PREFIX)/$(TARGET_NAME)/SDK/newlib/lib/
- cp -r $(BUILDDIR)/ndk/tmp/SDK/local/common/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/newlib/include/
- unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d
$(BUILDDIR)/ndk/tmp
+ cp -r $(BUILDDIR)/ndk/tmp/SDK/Include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/
+ cp -r $(BUILDDIR)/ndk/tmp/local/newlib/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/newlib/include/
mkdir -p $(BUILDDIR)/openurl
cd $(BUILDDIR)/openurl && tar xaf
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
cp -r
$(BUILDDIR)/openurl/libopenurl-$(UPSTREAM_OPENURL_VERSION)/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/
@@ -195,9 +192,6 @@ $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL):
wget -q -O $@ $(UPSTREAM_NDK_URI)
-$(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL):
- wget -q -O $@ $(UPSTREAM_NDK_UPDATE_URI)
-
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL):
wget -q -O $@ $(UPSTREAM_OPENURL_URI)
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
