Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/4bcfe801d5a685f146d9d77e2029667f50c9e4c7
...commit
http://git.netsurf-browser.org/toolchains.git/commit/4bcfe801d5a685f146d9d77e2029667f50c9e4c7
...tree
http://git.netsurf-browser.org/toolchains.git/tree/4bcfe801d5a685f146d9d77e2029667f50c9e4c7
The branch, master has been updated
via 4bcfe801d5a685f146d9d77e2029667f50c9e4c7 (commit)
from 133e614f2ed1bcd33e44d69058cbbe7058cd78a6 (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=4bcfe801d5a685f146d9d77e2029667f50c9e4c7
commit 4bcfe801d5a685f146d9d77e2029667f50c9e4c7
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
m68k-atari-mint: update SDK patches and LDG version
diff --git a/sdk/Makefile b/sdk/Makefile
index eed736f..5559037 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -53,7 +53,7 @@ VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20130415
# https://github.com/libexpat/libexpat
VERSION_LIBEXPAT := 2.5.0
-VERSION_LDG := 2.35
+VERSION_LDG := SVN-20150827
VERSION_WINDOM := 2.0.1
# https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v1.3.3.tar.gz
VERSION_HERMES := 1.3.3
@@ -326,7 +326,7 @@ $(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
# atari ldg library
$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
mkdir -p $(BUILDDIR)/ldg
- cd $(BUILDDIR)/ldg && unzip $(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ cd $(BUILDDIR)/ldg && tar xjf $(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2
$(env) make -C $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/src/devel -f gcc.mak
CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV) CC=${TARGET}-gcc AR=${TARGET}-ar
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/lib/gcc/libldg.a
$(GCCSDK_INSTALL_ENV)/lib/
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg.h
$(GCCSDK_INSTALL_ENV)/include/ldg.h
@@ -334,11 +334,11 @@ $(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d
$(BUILDSTEPS)/ldg-src.d
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg/mem.h
$(GCCSDK_INSTALL_ENV)/include/ldg/
touch $@
-$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2
touch $@
-$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/ldg/ldg-$(VERSION_LDG).zip" $@
+$(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ldg-$(VERSION_LDG).tar.bz2"
$@
# hermes bitmap lib
$(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d
diff --git a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
b/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
deleted file mode 100644
index 254a483..0000000
--- a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2011-03-08 23:18:37.000000000 +0000
-+++ configure 2011-03-08 23:18:59.000000000 +0000
-@@ -18503,8 +18503,6 @@
- stdbool.h \
- time.h \
- limits.h \
-- arpa/nameser.h \
-- arpa/nameser_compat.h \
- arpa/inet.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
new file mode 100644
index 0000000..d659de7
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
@@ -0,0 +1,12 @@
+--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200
++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200
+@@ -179,7 +179,9 @@
+ BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
+ #endif
+ BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " :
++#ifdef AF_UNIX
+ BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "",
++#endif
+ bindhost != NULL ? bindhost : "",
+ bindport != NULL ? ":" : "",
+ bindport != NULL ? bindport : "");
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
deleted file mode 100644
index ede1edc..0000000
--- a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
+++ /dev/null
@@ -1,18 +0,0 @@
---- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200
-+++ e_os.h 2018-06-03 03:19:36.000000000 +0200
-@@ -462,6 +462,15 @@
- # define OPENSSL_USE_IPV6 0
- # endif
- # endif
-+/*
-+ * We mean it
-+ */
-+# if (OPENSSL_USE_IPV6 == 0)
-+# undef AF_INET6
-+# warning undef AF_INET6
-+# undef AF_UNIX
-+# warning undef AF_UNIX
-+# endif
-
- # endif
-
diff --git
a/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
new file mode 100644
index 0000000..5ad3a7b
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
@@ -0,0 +1,19 @@
+--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200
++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200
+@@ -124,6 +124,16 @@
+ # define OPENSSL_USE_IPV6 0
+ # endif
+ # endif
++/*
++ * We mean it
++ */
++# if (OPENSSL_USE_IPV6 == 0)
++# undef AF_INET6
++# warning undef AF_INET6
++# undef AF_UNIX
++# warning undef AF_UNIX
++# undef IPV6_V6ONLY
++# endif
+
+ # define get_last_socket_error() errno
+ # define clear_socket_error() errno=0
diff --git a/sdk/recipes/patches/windom/src.globals.h.p
b/sdk/recipes/patches/windom/src.globals.h.p
new file mode 100644
index 0000000..34a7901
--- /dev/null
+++ b/sdk/recipes/patches/windom/src.globals.h.p
@@ -0,0 +1,19 @@
+--- src/globals.h.orig 2023-10-01 03:02:16.247962097 +0100
++++ src/globals.h 2023-10-01 03:03:20.403979699 +0100
+@@ -806,6 +806,8 @@
+ RSC header and support struct
+
*******************************************************************************/
+
++#ifndef __RSXHDR
++#define __RSXHDR
+ typedef struct { /* fichier ressource tendu */
+ UWORD rsh_vrsn; /* should be 3
*/
+ UWORD rsh_extvrsn; /* not used, initialised to 'IN' for Interface
*/
+@@ -827,6 +829,7 @@
+ ULONG rsh_nimages;
+ ULONG rsh_rssize; /* total bytes in resource */
+ } RSXHDR;
++#endif
+
+ typedef struct {
+ unsigned long rlen;
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 10 +++++-----
.../patches/libcares/m68k-atari-mint/configure.p | 11 -----------
.../openssl/m68k-atari-mint/apps.lib.s_socket.c.p | 12 ++++++++++++
.../patches/openssl/m68k-atari-mint/e_os.h.p | 18 ------------------
.../m68k-atari-mint/include.internal.sockets.h.p | 19 +++++++++++++++++++
sdk/recipes/patches/windom/src.globals.h.p | 19 +++++++++++++++++++
6 files changed, 55 insertions(+), 34 deletions(-)
delete mode 100644 sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
create mode 100644
sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
delete mode 100644 sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
create mode 100644
sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
create mode 100644 sdk/recipes/patches/windom/src.globals.h.p
diff --git a/sdk/Makefile b/sdk/Makefile
index eed736f..5559037 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -53,7 +53,7 @@ VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20130415
# https://github.com/libexpat/libexpat
VERSION_LIBEXPAT := 2.5.0
-VERSION_LDG := 2.35
+VERSION_LDG := SVN-20150827
VERSION_WINDOM := 2.0.1
# https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v1.3.3.tar.gz
VERSION_HERMES := 1.3.3
@@ -326,7 +326,7 @@ $(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
# atari ldg library
$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
mkdir -p $(BUILDDIR)/ldg
- cd $(BUILDDIR)/ldg && unzip $(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ cd $(BUILDDIR)/ldg && tar xjf $(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2
$(env) make -C $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/src/devel -f gcc.mak
CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV) CC=${TARGET}-gcc AR=${TARGET}-ar
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/lib/gcc/libldg.a
$(GCCSDK_INSTALL_ENV)/lib/
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg.h
$(GCCSDK_INSTALL_ENV)/include/ldg.h
@@ -334,11 +334,11 @@ $(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d
$(BUILDSTEPS)/ldg-src.d
cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg/mem.h
$(GCCSDK_INSTALL_ENV)/include/ldg/
touch $@
-$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2
touch $@
-$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
- $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"https://downloads.sourceforge.net/project/ldg/ldg-$(VERSION_LDG).zip" $@
+$(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@)
"http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ldg-$(VERSION_LDG).tar.bz2"
$@
# hermes bitmap lib
$(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d
diff --git a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
b/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
deleted file mode 100644
index 254a483..0000000
--- a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2011-03-08 23:18:37.000000000 +0000
-+++ configure 2011-03-08 23:18:59.000000000 +0000
-@@ -18503,8 +18503,6 @@
- stdbool.h \
- time.h \
- limits.h \
-- arpa/nameser.h \
-- arpa/nameser_compat.h \
- arpa/inet.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
new file mode 100644
index 0000000..d659de7
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p
@@ -0,0 +1,12 @@
+--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200
++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200
+@@ -179,7 +179,9 @@
+ BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
+ #endif
+ BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " :
++#ifdef AF_UNIX
+ BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "",
++#endif
+ bindhost != NULL ? bindhost : "",
+ bindport != NULL ? ":" : "",
+ bindport != NULL ? bindport : "");
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
deleted file mode 100644
index ede1edc..0000000
--- a/sdk/recipes/patches/openssl/m68k-atari-mint/e_os.h.p
+++ /dev/null
@@ -1,18 +0,0 @@
---- e_os.h.orig 2018-06-03 03:19:29.000000000 +0200
-+++ e_os.h 2018-06-03 03:19:36.000000000 +0200
-@@ -462,6 +462,15 @@
- # define OPENSSL_USE_IPV6 0
- # endif
- # endif
-+/*
-+ * We mean it
-+ */
-+# if (OPENSSL_USE_IPV6 == 0)
-+# undef AF_INET6
-+# warning undef AF_INET6
-+# undef AF_UNIX
-+# warning undef AF_UNIX
-+# endif
-
- # endif
-
diff --git
a/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
new file mode 100644
index 0000000..5ad3a7b
--- /dev/null
+++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p
@@ -0,0 +1,19 @@
+--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200
++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200
+@@ -124,6 +124,16 @@
+ # define OPENSSL_USE_IPV6 0
+ # endif
+ # endif
++/*
++ * We mean it
++ */
++# if (OPENSSL_USE_IPV6 == 0)
++# undef AF_INET6
++# warning undef AF_INET6
++# undef AF_UNIX
++# warning undef AF_UNIX
++# undef IPV6_V6ONLY
++# endif
+
+ # define get_last_socket_error() errno
+ # define clear_socket_error() errno=0
diff --git a/sdk/recipes/patches/windom/src.globals.h.p
b/sdk/recipes/patches/windom/src.globals.h.p
new file mode 100644
index 0000000..34a7901
--- /dev/null
+++ b/sdk/recipes/patches/windom/src.globals.h.p
@@ -0,0 +1,19 @@
+--- src/globals.h.orig 2023-10-01 03:02:16.247962097 +0100
++++ src/globals.h 2023-10-01 03:03:20.403979699 +0100
+@@ -806,6 +806,8 @@
+ RSC header and support struct
+
*******************************************************************************/
+
++#ifndef __RSXHDR
++#define __RSXHDR
+ typedef struct { /* fichier ressource tendu */
+ UWORD rsh_vrsn; /* should be 3
*/
+ UWORD rsh_extvrsn; /* not used, initialised to 'IN' for Interface
*/
+@@ -827,6 +829,7 @@
+ ULONG rsh_nimages;
+ ULONG rsh_rssize; /* total bytes in resource */
+ } RSXHDR;
++#endif
+
+ typedef struct {
+ unsigned long rlen;
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
