Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/c86aacc4540add3a46... ...commit http://git.netsurf-browser.org/toolchains.git/commit/c86aacc4540add3a46bf... ...tree http://git.netsurf-browser.org/toolchains.git/tree/c86aacc4540add3a46bf2f... The branch, master has been updated via c86aacc4540add3a46bf2f53077943254268a33b (commit) from 944f657356371302cb25a42660e4643d72003b5e (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=c86aacc4540add3a... commit c86aacc4540add3a46bf2f53077943254268a33b Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; fix windows toolchain build after openssl 1.1 update diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p new file mode 100644 index 0000000..c492c01 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p @@ -0,0 +1,28 @@ +--- /dev/null 2017-10-10 15:19:45.611896396 +0100 ++++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100 +@@ -0,0 +1,25 @@ ++%targets = ( ++ ++ "i686-w64-mingw32" => { ++ inherit_from => [ "BASE_unix", asm("x86_asm"), ++ sub { $disabled{shared} ? () : "x86_uplink" } ], ++ cc => "gcc", ++ cflags => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", ++ debug => "-g -O0", ++ release => "-O3 -fomit-frame-pointer"), ++ threads("-D_MT")), ++ sys_id => "MINGW32", ++ ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), ++ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", ++ thread_scheme => "winthreads", ++ perlasm_scheme => "coff", ++ dso_scheme => "win32", ++ shared_target => "mingw-shared", ++ shared_cflag => add("-D_WINDLL"), ++ shared_ldflag => "-static-libgcc", ++ shared_rcflag => "--target=pe-i386", ++ shared_extension => ".dll", ++ multilib => "", ++ apps_aux_src => add("win32_init.c"), ++ }, ++); diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/crypto.rand.build.info.p deleted file mode 100644 index 58b672f..0000000 --- a/sdk/recipes/patches/openssl/crypto.rand.build.info.p +++ /dev/null @@ -1,9 +0,0 @@ ---- crypto/rand/build.info.orig 2017-11-22 11:36:06.585363219 +0000 -+++ crypto/rand/build.info 2017-11-22 11:36:39.267232034 +0000 -@@ -1,4 +1,4 @@ - LIBS=../../libcrypto - SOURCE[../../libcrypto]=\ -- md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ -- rand_win.c rand_unix.c rand_vms.c -+ md_rand.c randfile.c rand_lib.c rand_err.c rand_amiga.c \ -+ rand_egd.c rand_win.c rand_unix.c rand_vms.c diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p new file mode 100644 index 0000000..58b672f --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p @@ -0,0 +1,9 @@ +--- crypto/rand/build.info.orig 2017-11-22 11:36:06.585363219 +0000 ++++ crypto/rand/build.info 2017-11-22 11:36:39.267232034 +0000 +@@ -1,4 +1,4 @@ + LIBS=../../libcrypto + SOURCE[../../libcrypto]=\ +- md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ +- rand_win.c rand_unix.c rand_vms.c ++ md_rand.c randfile.c rand_lib.c rand_err.c rand_amiga.c \ ++ rand_egd.c rand_win.c rand_unix.c rand_vms.c diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p new file mode 100644 index 0000000..58b672f --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p @@ -0,0 +1,9 @@ +--- crypto/rand/build.info.orig 2017-11-22 11:36:06.585363219 +0000 ++++ crypto/rand/build.info 2017-11-22 11:36:39.267232034 +0000 +@@ -1,4 +1,4 @@ + LIBS=../../libcrypto + SOURCE[../../libcrypto]=\ +- md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ +- rand_win.c rand_unix.c rand_vms.c ++ md_rand.c randfile.c rand_lib.c rand_err.c rand_amiga.c \ ++ rand_egd.c rand_win.c rand_unix.c rand_vms.c ----------------------------------------------------------------------- Summary of changes: .../openssl/Configurations-50-windows.conf.p | 28 ++++++++++++++++++++ .../crypto.rand.build.info.p | 0 .../{ => ppc-amigaos}/crypto.rand.build.info.p | 0 3 files changed, 28 insertions(+) create mode 100644 sdk/recipes/patches/openssl/Configurations-50-windows.conf.p copy sdk/recipes/patches/openssl/{ => m68k-unknown-amigaos}/crypto.rand.build.info.p (100%) rename sdk/recipes/patches/openssl/{ => ppc-amigaos}/crypto.rand.build.info.p (100%) diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p new file mode 100644 index 0000000..c492c01 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p @@ -0,0 +1,28 @@ +--- /dev/null 2017-10-10 15:19:45.611896396 +0100 ++++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100 +@@ -0,0 +1,25 @@ ++%targets = ( ++ ++ "i686-w64-mingw32" => { ++ inherit_from => [ "BASE_unix", asm("x86_asm"), ++ sub { $disabled{shared} ? () : "x86_uplink" } ], ++ cc => "gcc", ++ cflags => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", ++ debug => "-g -O0", ++ release => "-O3 -fomit-frame-pointer"), ++ threads("-D_MT")), ++ sys_id => "MINGW32", ++ ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), ++ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", ++ thread_scheme => "winthreads", ++ perlasm_scheme => "coff", ++ dso_scheme => "win32", ++ shared_target => "mingw-shared", ++ shared_cflag => add("-D_WINDLL"), ++ shared_ldflag => "-static-libgcc", ++ shared_rcflag => "--target=pe-i386", ++ shared_extension => ".dll", ++ multilib => "", ++ apps_aux_src => add("win32_init.c"), ++ }, ++); diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p similarity index 100% copy from sdk/recipes/patches/openssl/crypto.rand.build.info.p copy to sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.rand.build.info.p diff --git a/sdk/recipes/patches/openssl/crypto.rand.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p similarity index 100% rename from sdk/recipes/patches/openssl/crypto.rand.build.info.p rename to sdk/recipes/patches/openssl/ppc-amigaos/crypto.rand.build.info.p -- Cross-compilation toolchains and environments