Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/26243dde765e36eddf831ed267d7a472113dbe0d
...commit
http://git.netsurf-browser.org/toolchains.git/commit/26243dde765e36eddf831ed267d7a472113dbe0d
...tree
http://git.netsurf-browser.org/toolchains.git/tree/26243dde765e36eddf831ed267d7a472113dbe0d
The branch, master has been updated
via 26243dde765e36eddf831ed267d7a472113dbe0d (commit)
via a1608c5c99ae8cc39b85a91c0470d43d3b6eff20 (commit)
via 7d3eba58da09ae7585bb6d84e5a390226a23ed6f (commit)
from a04d5edbeef3b2a02c5731eab865272f75e64070 (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=26243dde765e36eddf831ed267d7a472113dbe0d
commit 26243dde765e36eddf831ed267d7a472113dbe0d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add codesets includes for OS3 too
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index cd544b8..16ea2bb 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -42,6 +42,10 @@ UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTRE
UPSTREAM_RENDER_TARBALL := renderlib.lha
UPSTREAM_RENDER_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL)
+UPSTREAM_CODESETS_VERSION := 6.20
+UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha
+UPSTREAM_CODESETS_URI :=
https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_TARBALL)
+
# need to build a suitable version of bison or compiler build fails
UPSTREAM_BISON_VERSION := 2.7.1
UPSTREAM_BISON_TARBALL := bison-$(UPSTREAM_BISON_VERSION).tar.gz
@@ -108,7 +112,7 @@ $(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(BUILDSTEPS)/ndk.d $(
# Rules to install the NDK
###
-$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
+$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
mkdir -p $(PREFIX)/$(TARGET_NAME)
tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf
$(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d
$(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done
@@ -123,6 +127,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/renderlib
lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
cp -r $(BUILDDIR)/renderlib/renderlib/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
+ mkdir -p $(BUILDDIR)/codesets
+ lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
touch $@
###
@@ -245,6 +252,9 @@ $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL):
wget -q -O $@ $(UPSTREAM_BISON_URI)
+$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL):
+ wget -q -O $@ $(UPSTREAM_CODESETS_URI)
+
###
# Rule to create buildsteps dir
###
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=a1608c5c99ae8cc39b85a91c0470d43d3b6eff20
commit a1608c5c99ae8cc39b85a91c0470d43d3b6eff20
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Add codesets.library includes, will be needed to fix #2578
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index 578fd56..b0eecaf 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -35,6 +35,10 @@ UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTRE
UPSTREAM_RENDER_TARBALL := renderlib.lha
UPSTREAM_RENDER_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL)
+UPSTREAM_CODESETS_VERSION := 6.20
+UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha
+UPSTREAM_CODESETS_URI :=
https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_TARBALL)
+
# need to force the auto* version in use
GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
@@ -85,7 +89,7 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(
# Rules to install the NDK
###
-$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_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
@@ -109,6 +113,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/renderlib
lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
cp -r $(BUILDDIR)/renderlib/renderlib/include_os4/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/
+ mkdir -p $(BUILDDIR)/codesets
+ lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/
touch $@
###
@@ -187,6 +194,9 @@ $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL):
wget -q -O $@ $(UPSTREAM_RENDER_URI)
+$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL):
+ wget -q -O $@ $(UPSTREAM_CODESETS_URI)
+
###
# Rule to create buildsteps dir
###
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=7d3eba58da09ae7585bb6d84e5a390226a23ed6f
commit 7d3eba58da09ae7585bb6d84e5a390226a23ed6f
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Re-add some of the previous OpenSSL optimisations
I believe OpenSSL is causing NetSurf to not start up on the PPC440EP. The
OpenSSL executable appears to be working correctly. Not sure if other CPUs are
affected yet. This patch does *not* fix this critical issue.
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 23a635b..9641a5e 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -8,12 +8,12 @@
+ cc => "ppc-amigaos-gcc",
+ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG",
+ debug => "-O0 -g",
-+ release => "-O3 ",
++ release => "-O3 -fomit-frame-pointer",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
+ perlasm_scheme => "linux32",
+ sys_id => "AMIGAOS4",
-+ bn_ops => "BN_LLONG",
++ bn_ops => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR",
+ ranlib => "ppc-amigaos-ranlib",
+ },
+
@@ -22,12 +22,12 @@
+ cc => "m68k-unknown-amigaos-gcc",
+ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=c99",
+ debug => "-O0 -g",
-+ release => "-O3 ",
++ release => "-O3 -fomit-frame-pointer",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
+ ex_libs => add("-lm -lnet"),
+ sys_id => "AMIGAOS3",
-+ bn_ops => "BN_LLONG",
++ bn_ops => "THIRTY_TWO_BIT BN_LLONG",
+ ranlib => "m68k-unknown-amigaos-ranlib",
+ },
+);
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 12 +++++++++++-
ppc-amigaos/Makefile | 12 +++++++++++-
.../patches/openssl/Configurations-50-amigaos.conf.p | 8 ++++----
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index cd544b8..16ea2bb 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -42,6 +42,10 @@ UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTRE
UPSTREAM_RENDER_TARBALL := renderlib.lha
UPSTREAM_RENDER_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL)
+UPSTREAM_CODESETS_VERSION := 6.20
+UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha
+UPSTREAM_CODESETS_URI :=
https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_TARBALL)
+
# need to build a suitable version of bison or compiler build fails
UPSTREAM_BISON_VERSION := 2.7.1
UPSTREAM_BISON_TARBALL := bison-$(UPSTREAM_BISON_VERSION).tar.gz
@@ -108,7 +112,7 @@ $(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d
$(BUILDSTEPS)/ndk.d $(
# Rules to install the NDK
###
-$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
+$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
mkdir -p $(PREFIX)/$(TARGET_NAME)
tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf
$(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d
$(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done
@@ -123,6 +127,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/renderlib
lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
cp -r $(BUILDDIR)/renderlib/renderlib/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
+ mkdir -p $(BUILDDIR)/codesets
+ lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
touch $@
###
@@ -245,6 +252,9 @@ $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL):
wget -q -O $@ $(UPSTREAM_BISON_URI)
+$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL):
+ wget -q -O $@ $(UPSTREAM_CODESETS_URI)
+
###
# Rule to create buildsteps dir
###
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index 578fd56..b0eecaf 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -35,6 +35,10 @@ UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTRE
UPSTREAM_RENDER_TARBALL := renderlib.lha
UPSTREAM_RENDER_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL)
+UPSTREAM_CODESETS_VERSION := 6.20
+UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha
+UPSTREAM_CODESETS_URI :=
https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_TARBALL)
+
# need to force the auto* version in use
GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
@@ -85,7 +89,7 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d $(
# Rules to install the NDK
###
-$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_RENDER_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
@@ -109,6 +113,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/renderlib
lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL)
cp -r $(BUILDDIR)/renderlib/renderlib/include_os4/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/
+ mkdir -p $(BUILDDIR)/codesets
+ lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/
touch $@
###
@@ -187,6 +194,9 @@ $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL):
wget -q -O $@ $(UPSTREAM_RENDER_URI)
+$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL):
+ wget -q -O $@ $(UPSTREAM_CODESETS_URI)
+
###
# Rule to create buildsteps dir
###
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index 23a635b..9641a5e 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -8,12 +8,12 @@
+ cc => "ppc-amigaos-gcc",
+ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYSLOG",
+ debug => "-O0 -g",
-+ release => "-O3 ",
++ release => "-O3 -fomit-frame-pointer",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
+ perlasm_scheme => "linux32",
+ sys_id => "AMIGAOS4",
-+ bn_ops => "BN_LLONG",
++ bn_ops => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR",
+ ranlib => "ppc-amigaos-ranlib",
+ },
+
@@ -22,12 +22,12 @@
+ cc => "m68k-unknown-amigaos-gcc",
+ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=c99",
+ debug => "-O0 -g",
-+ release => "-O3 ",
++ release => "-O3 -fomit-frame-pointer",
+ threads("-D_REENTRANT")),
+ thread_scheme => "(unknown)",
+ ex_libs => add("-lm -lnet"),
+ sys_id => "AMIGAOS3",
-+ bn_ops => "BN_LLONG",
++ bn_ops => "THIRTY_TWO_BIT BN_LLONG",
+ ranlib => "m68k-unknown-amigaos-ranlib",
+ },
+);
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
