Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/ebbf82001a80cff52e... ...commit http://git.netsurf-browser.org/toolchains.git/commit/ebbf82001a80cff52e84... ...tree http://git.netsurf-browser.org/toolchains.git/tree/ebbf82001a80cff52e847a... The branch, master has been updated via ebbf82001a80cff52e847a6b8bd716701e972218 (commit) via 9cfc12d2facb9fa9a3e648448f9aed96d4583384 (commit) via 1be884811237c6ae3b70afed70eac27a8fc41cc5 (commit) via 5e71cd0080285dce5ee903f13cff496dad5fa668 (commit) from a6cd4d1e9f3ac2eb6e729c20b589227549eba42e (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=ebbf82001a80cff5... commit ebbf82001a80cff52e847a6b8bd716701e972218 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; fix openssl ppc build diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p b/sdk/recipes/patches/openssl/apps.s_socket.c.p new file mode 100644 index 0000000..f4c8e1c --- /dev/null +++ b/sdk/recipes/patches/openssl/apps.s_socket.c.p @@ -0,0 +1,18 @@ +--- apps/s_socket.c.orig 2019-02-13 18:04:36.643334493 +0000 ++++ apps/s_socket.c 2019-02-13 18:04:46.271279170 +0000 +@@ -160,6 +160,7 @@ + sock_protocol = BIO_ADDRINFO_protocol(res); + sock_address = BIO_ADDRINFO_address(res); + next = BIO_ADDRINFO_next(res); ++#ifdef AF_INET6 + if (sock_family == AF_INET6) + sock_options |= BIO_SOCK_V6_ONLY; + if (next != NULL +@@ -174,6 +175,7 @@ + sock_options &= ~BIO_SOCK_V6_ONLY; + } + } ++#endif + + asock = BIO_socket(sock_family, sock_type, sock_protocol, 0); + if (asock == INVALID_SOCKET commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=9cfc12d2facb9fa9... commit 9cfc12d2facb9fa9a3e648448f9aed96d4583384 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; fix RISCOS cross compiler target to correctly retrieve infozip diff --git a/README b/README index 84c872c..237dbb3 100644 --- a/README +++ b/README @@ -19,8 +19,14 @@ RISC OS It is important that the output prefix (/opt/netsurf by default) is writable or use sudo to do the make - $ cd arm-unknown-riscos - $ make - $ cd ../sdk - $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make + $ make -C arm-unknown-riscos + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make -C sdk + +Windows +------- + +The mingw cross build toolchain is made by + + $ make -C i686-w64-mingw32 + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/i686-w64-mingw32/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/i686-w64-mingw32/env make -C sdk diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index dc7c72d..64516de 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -4,23 +4,23 @@ UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION) # OSLib 7.00 -UPSTREAM_OSLIB_VERSION := oslib-700 -UPSTREAM_OSLIB_TARBALL := oslib -UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/$(UPSTREAM_OSLIB_VERSION)/!O... +UPSTREAM_OSLIB_VERSION := 700 +UPSTREAM_OSLIB_TARBALL := oslib$(UPSTREAM_OSLIB_VERSION).tar.gz +UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/oslib-$(UPSTREAM_OSLIB_VERSI... # Known tested version of trunk for CCRes UPSTREAM_CCRES_VERSION := 96 -UPSTREAM_CCRES_TARBALL := ccres +UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := unused -UPSTREAM_MAKERUN_TARBALL := makerun +UPSTREAM_MAKERUN_VERSION := abdbd16 +UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git # Squeeze -UPSTREAM_SQUEEZE_VERSION := unused -UPSTREAM_SQUEEZE_TARBALL := squeeze +UPSTREAM_SQUEEZE_VERSION := f26ccd6 +UPSTREAM_SQUEEZE_TARBALL := squeeze$(UPSTREAM_SQUEEZE_VERSION).tar.gz UPSTREAM_SQUEEZE_URI := git://git.netsurf-browser.org/squeeze.git # Infozip @@ -76,7 +76,7 @@ $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TA ### $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) $(BUILDDIR)/makerun + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) cd $(BUILDDIR)/makerun && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -85,7 +85,7 @@ $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TA ### $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) $(BUILDDIR)/squeeze + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) cd $(BUILDDIR)/squeeze && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -94,7 +94,7 @@ $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TA ### $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) $(BUILDDIR)/ccres + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -104,7 +104,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARB ### $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) $(BUILDDIR)/oslib + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d $(BUILDDIR)/oslib -p0 <$$p ; done cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -138,19 +138,25 @@ $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL): tar -C $(SOURCESDIR) -caf $@ gcc4 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL): - svn co $(UPSTREAM_OSLIB_URI) $@ + svn co $(UPSTREAM_OSLIB_URI) $(SOURCESDIR)/oslib + tar -C $(SOURCESDIR) -caf $@ oslib $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL): - svn co $(UPSTREAM_CCRES_URI) $@ + svn co $(UPSTREAM_CCRES_URI) $(SOURCESDIR)/ccres + tar -C $(SOURCESDIR) -caf $@ ccres $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL): - git clone $(UPSTREAM_MAKERUN_URI) $@ + $(RM) -rf $(SOURCESDIR)/makerun + git clone $(UPSTREAM_MAKERUN_URI) $(SOURCESDIR)/makerun + tar -C $(SOURCESDIR) -caf $@ makerun $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL): - git clone $(UPSTREAM_SQUEEZE_URI) $@ + $(RM) -rf $(SOURCESDIR)/squeeze + git clone $(UPSTREAM_SQUEEZE_URI) $(SOURCESDIR)/squeeze + tar -C $(SOURCESDIR) -caf $@ squeeze -$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL): - $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ +$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL): + $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCESDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ ### # Rule to create buildsteps dir diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index c81cebd..240411b 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -21,7 +21,7 @@ UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) UPSTREAM_MINGW_VERSION := 3.3.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 @@ -172,4 +172,4 @@ $(SOURCESDIR): mkdir -p $(SOURCESDIR) $(SRCDIR): - mkdir -p $(SRCDIR) \ No newline at end of file + mkdir -p $(SRCDIR) commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=1be884811237c6ae... commit 1be884811237c6ae3b70afed70eac27a8fc41cc5 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; update sdk some library versions diff --git a/sdk/Makefile b/sdk/Makefile index 4af3119..3827095 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -26,12 +26,12 @@ endif VERSION_ZLIB := 1.2.11 VERSION_LIBICONV := 1.15 VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.1.0g -VERSION_LIBPNG := 1.6.29 +VERSION_OPENSSL := 1.1.0j +VERSION_LIBPNG := 1.6.36 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.3 VERSION_LIBCARES := 1.13.0 -VERSION_LIBCURL := 7.58.0 +VERSION_LIBCURL := 7.64.0 VERSION_LIBGNURX := 2.5.1 VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p b/sdk/recipes/patches/openssl/mem_sec.c.p index 156cc93..e209f75 100644 --- a/sdk/recipes/patches/openssl/mem_sec.c.p +++ b/sdk/recipes/patches/openssl/mem_sec.c.p @@ -1,11 +1,15 @@ ---- crypto/mem_sec.c.orig 2017-10-17 16:46:24.923285526 +0100 -+++ crypto/mem_sec.c 2017-10-17 16:48:00.358325267 +0100 -@@ -24,7 +24,7 @@ - +--- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000 ++++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000 +@@ -25,7 +25,11 @@ #include <string.h> --#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) -+#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && ! defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) - # define IMPLEMENTED - # include <stdlib.h> - # include <assert.h> + /* e_os.h includes unistd.h, which defines _POSIX_VERSION */ +-#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \ ++#if !defined(OPENSSL_NO_SECURE_MEMORY) \ ++ && !defined(OPENSSL_SYS_RISCOS) \ ++ && !defined(OPENSSL_SYS_AMIGAOS3) \ ++ && !defined(OPENSSL_SYS_AMIGAOS4) \ ++ && defined(OPENSSL_SYS_UNIX) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) ) commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=5e71cd0080285dce... commit 5e71cd0080285dce5ee903f13cff496dad5fa668 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; updated the location of mpc downloads diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile index 04ecd05..484c476 100644 --- a/i686-w64-mingw32/Makefile +++ b/i686-w64-mingw32/Makefile @@ -12,7 +12,7 @@ UPSTREAM_BINUTILS_URI := http://ftpmirror.gnu.org/binutils/$(UPSTREAM_BINUTILS_T UPSTREAM_GMP_VERSION := 5.0.5 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 -UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) +UPSTREAM_GMP_URI := https://gmplib.org/download/gmp-$(UPSTREAM_GMP_VERSION)/$(UPSTREAM_GMP_TA... # Would use 3.0.0, but that dislikes in-tree gmp sources UPSTREAM_MPFR_VERSION := 2.4.2 @@ -21,7 +21,7 @@ UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) UPSTREAM_MINGW_VERSION := 3.3.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 ----------------------------------------------------------------------- Summary of changes: README | 14 ++++++--- arm-unknown-riscos/Makefile | 42 ++++++++++++++----------- i686-w64-mingw32/Makefile | 4 +-- sdk/Makefile | 6 ++-- sdk/recipes/patches/openssl/apps.s_socket.c.p | 18 +++++++++++ sdk/recipes/patches/openssl/mem_sec.c.p | 22 +++++++------ x86_64-w64-mingw32/Makefile | 4 +-- 7 files changed, 72 insertions(+), 38 deletions(-) create mode 100644 sdk/recipes/patches/openssl/apps.s_socket.c.p diff --git a/README b/README index 84c872c..237dbb3 100644 --- a/README +++ b/README @@ -19,8 +19,14 @@ RISC OS It is important that the output prefix (/opt/netsurf by default) is writable or use sudo to do the make - $ cd arm-unknown-riscos - $ make - $ cd ../sdk - $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make + $ make -C arm-unknown-riscos + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make -C sdk + +Windows +------- + +The mingw cross build toolchain is made by + + $ make -C i686-w64-mingw32 + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/i686-w64-mingw32/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/i686-w64-mingw32/env make -C sdk diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index dc7c72d..64516de 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -4,23 +4,23 @@ UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION) # OSLib 7.00 -UPSTREAM_OSLIB_VERSION := oslib-700 -UPSTREAM_OSLIB_TARBALL := oslib -UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/$(UPSTREAM_OSLIB_VERSION)/!O... +UPSTREAM_OSLIB_VERSION := 700 +UPSTREAM_OSLIB_TARBALL := oslib$(UPSTREAM_OSLIB_VERSION).tar.gz +UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/oslib-$(UPSTREAM_OSLIB_VERSI... # Known tested version of trunk for CCRes UPSTREAM_CCRES_VERSION := 96 -UPSTREAM_CCRES_TARBALL := ccres +UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := unused -UPSTREAM_MAKERUN_TARBALL := makerun +UPSTREAM_MAKERUN_VERSION := abdbd16 +UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git # Squeeze -UPSTREAM_SQUEEZE_VERSION := unused -UPSTREAM_SQUEEZE_TARBALL := squeeze +UPSTREAM_SQUEEZE_VERSION := f26ccd6 +UPSTREAM_SQUEEZE_TARBALL := squeeze$(UPSTREAM_SQUEEZE_VERSION).tar.gz UPSTREAM_SQUEEZE_URI := git://git.netsurf-browser.org/squeeze.git # Infozip @@ -76,7 +76,7 @@ $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TA ### $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) $(BUILDDIR)/makerun + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) cd $(BUILDDIR)/makerun && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -85,7 +85,7 @@ $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TA ### $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) $(BUILDDIR)/squeeze + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) cd $(BUILDDIR)/squeeze && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -94,7 +94,7 @@ $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TA ### $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) $(BUILDDIR)/ccres + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -104,7 +104,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARB ### $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) $(BUILDDIR)/oslib + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d $(BUILDDIR)/oslib -p0 <$$p ; done cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -138,19 +138,25 @@ $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL): tar -C $(SOURCESDIR) -caf $@ gcc4 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL): - svn co $(UPSTREAM_OSLIB_URI) $@ + svn co $(UPSTREAM_OSLIB_URI) $(SOURCESDIR)/oslib + tar -C $(SOURCESDIR) -caf $@ oslib $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL): - svn co $(UPSTREAM_CCRES_URI) $@ + svn co $(UPSTREAM_CCRES_URI) $(SOURCESDIR)/ccres + tar -C $(SOURCESDIR) -caf $@ ccres $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL): - git clone $(UPSTREAM_MAKERUN_URI) $@ + $(RM) -rf $(SOURCESDIR)/makerun + git clone $(UPSTREAM_MAKERUN_URI) $(SOURCESDIR)/makerun + tar -C $(SOURCESDIR) -caf $@ makerun $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL): - git clone $(UPSTREAM_SQUEEZE_URI) $@ + $(RM) -rf $(SOURCESDIR)/squeeze + git clone $(UPSTREAM_SQUEEZE_URI) $(SOURCESDIR)/squeeze + tar -C $(SOURCESDIR) -caf $@ squeeze -$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL): - $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ +$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL): + $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCESDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ ### # Rule to create buildsteps dir diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile index 04ecd05..484c476 100644 --- a/i686-w64-mingw32/Makefile +++ b/i686-w64-mingw32/Makefile @@ -12,7 +12,7 @@ UPSTREAM_BINUTILS_URI := http://ftpmirror.gnu.org/binutils/$(UPSTREAM_BINUTILS_T UPSTREAM_GMP_VERSION := 5.0.5 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 -UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) +UPSTREAM_GMP_URI := https://gmplib.org/download/gmp-$(UPSTREAM_GMP_VERSION)/$(UPSTREAM_GMP_TA... # Would use 3.0.0, but that dislikes in-tree gmp sources UPSTREAM_MPFR_VERSION := 2.4.2 @@ -21,7 +21,7 @@ UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) UPSTREAM_MINGW_VERSION := 3.3.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 diff --git a/sdk/Makefile b/sdk/Makefile index 4af3119..3827095 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -26,12 +26,12 @@ endif VERSION_ZLIB := 1.2.11 VERSION_LIBICONV := 1.15 VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.1.0g -VERSION_LIBPNG := 1.6.29 +VERSION_OPENSSL := 1.1.0j +VERSION_LIBPNG := 1.6.36 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.3 VERSION_LIBCARES := 1.13.0 -VERSION_LIBCURL := 7.58.0 +VERSION_LIBCURL := 7.64.0 VERSION_LIBGNURX := 2.5.1 VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 diff --git a/sdk/recipes/patches/openssl/apps.s_socket.c.p b/sdk/recipes/patches/openssl/apps.s_socket.c.p new file mode 100644 index 0000000..f4c8e1c --- /dev/null +++ b/sdk/recipes/patches/openssl/apps.s_socket.c.p @@ -0,0 +1,18 @@ +--- apps/s_socket.c.orig 2019-02-13 18:04:36.643334493 +0000 ++++ apps/s_socket.c 2019-02-13 18:04:46.271279170 +0000 +@@ -160,6 +160,7 @@ + sock_protocol = BIO_ADDRINFO_protocol(res); + sock_address = BIO_ADDRINFO_address(res); + next = BIO_ADDRINFO_next(res); ++#ifdef AF_INET6 + if (sock_family == AF_INET6) + sock_options |= BIO_SOCK_V6_ONLY; + if (next != NULL +@@ -174,6 +175,7 @@ + sock_options &= ~BIO_SOCK_V6_ONLY; + } + } ++#endif + + asock = BIO_socket(sock_family, sock_type, sock_protocol, 0); + if (asock == INVALID_SOCKET diff --git a/sdk/recipes/patches/openssl/mem_sec.c.p b/sdk/recipes/patches/openssl/mem_sec.c.p index 156cc93..e209f75 100644 --- a/sdk/recipes/patches/openssl/mem_sec.c.p +++ b/sdk/recipes/patches/openssl/mem_sec.c.p @@ -1,11 +1,15 @@ ---- crypto/mem_sec.c.orig 2017-10-17 16:46:24.923285526 +0100 -+++ crypto/mem_sec.c 2017-10-17 16:48:00.358325267 +0100 -@@ -24,7 +24,7 @@ - +--- crypto/mem_sec.c.orig 2019-02-13 14:25:17.725058588 +0000 ++++ crypto/mem_sec.c 2019-02-13 14:35:39.790029062 +0000 +@@ -25,7 +25,11 @@ #include <string.h> --#if defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX) -+#if ! defined(OPENSSL_SYS_RISCOS) && ! defined(OPENSSL_SYS_AMIGAOS3) && ! defined(OPENSSL_SYS_AMIGAOS4) && (defined(OPENSSL_SYS_LINUX) || defined(OPENSSL_SYS_UNIX)) - # define IMPLEMENTED - # include <stdlib.h> - # include <assert.h> + /* e_os.h includes unistd.h, which defines _POSIX_VERSION */ +-#if !defined(OPENSSL_NO_SECURE_MEMORY) && defined(OPENSSL_SYS_UNIX) \ ++#if !defined(OPENSSL_NO_SECURE_MEMORY) \ ++ && !defined(OPENSSL_SYS_RISCOS) \ ++ && !defined(OPENSSL_SYS_AMIGAOS3) \ ++ && !defined(OPENSSL_SYS_AMIGAOS4) \ ++ && defined(OPENSSL_SYS_UNIX) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) ) diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index c81cebd..240411b 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -21,7 +21,7 @@ UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz -UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) +UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL) UPSTREAM_MINGW_VERSION := 3.3.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 @@ -172,4 +172,4 @@ $(SOURCESDIR): mkdir -p $(SOURCESDIR) $(SRCDIR): - mkdir -p $(SRCDIR) \ No newline at end of file + mkdir -p $(SRCDIR) -- Cross-compilation toolchains and environments