Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b
The branch, master has been updated
via f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b (commit)
via af1f1f375d0f0fdaf885f72fdbcd873f2203d227 (commit)
from 67b7854737f23f76b700a6fe76ce6060435f5cff (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/netsurf.git/commit/?id=f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b
commit f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
inhibit javascipt for native builds on architectures where it miscompiles
diff --git a/Makefile b/Makefile
index f616c6d..2371755 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@ HOST := $(shell uname -s)
# TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
-
ifeq ($(HOST),)
HOST := riscos
$(warning Build platform determination failed but that's a known problem for
RISC OS so we're assuming a native RISC OS build.)
@@ -300,7 +299,21 @@ else
endif
else
# All native targets
- PKG_CONFIG := pkg-config
+
+ # The machine architecture
+ # Possibles: i386 i686 x86_64 ia64 alpha amd64 arm
+ # armeb armel hppa m32r m68k mips mipsel powerpc ppc64
+ # s390 s390x sh3 sh3eb sh4 sh4eb sparc
+ HOST_ARCH := $(shell uname -m)
+
+ # disable duktape use on architectures where it miscompiles
+ NO_DUKTAPE_ARCH := s390 s390x ppc64
+ ifeq ($(filter-out $(NO_DUKTAPE_ARCH),$(HOST_ARCH)),)
+ override NETSURF_USE_DUKTAPE := NO
+ endif
+
+ # use native package config
+ PKG_CONFIG := pkg-config
# gtk target processing
ifeq ($(TARGET),gtk3)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=af1f1f375d0f0fdaf885f72fdbcd873f2203d227
commit af1f1f375d0f0fdaf885f72fdbcd873f2203d227
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
make nsgenbind call last in rule so faliures are noticed by make
diff --git a/content/handlers/javascript/duktape/Makefile
b/content/handlers/javascript/duktape/Makefile
index 89f83b1..37e33d5 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -15,7 +15,6 @@ $(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile:
content/handlers/javas
$(Q)mkdir -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
$(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $<
$(OBJROOT)/duktape
- $(VQ)echo " GENBIND: completed"
# create unimplemented report for doxygen
Docs/UnimplementedJavascript.txt:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 17 +++++++++++++++--
content/handlers/javascript/duktape/Makefile | 1 -
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index f616c6d..2371755 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@ HOST := $(shell uname -s)
# TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
-
ifeq ($(HOST),)
HOST := riscos
$(warning Build platform determination failed but that's a known problem for
RISC OS so we're assuming a native RISC OS build.)
@@ -300,7 +299,21 @@ else
endif
else
# All native targets
- PKG_CONFIG := pkg-config
+
+ # The machine architecture
+ # Possibles: i386 i686 x86_64 ia64 alpha amd64 arm
+ # armeb armel hppa m32r m68k mips mipsel powerpc ppc64
+ # s390 s390x sh3 sh3eb sh4 sh4eb sparc
+ HOST_ARCH := $(shell uname -m)
+
+ # disable duktape use on architectures where it miscompiles
+ NO_DUKTAPE_ARCH := s390 s390x ppc64
+ ifeq ($(filter-out $(NO_DUKTAPE_ARCH),$(HOST_ARCH)),)
+ override NETSURF_USE_DUKTAPE := NO
+ endif
+
+ # use native package config
+ PKG_CONFIG := pkg-config
# gtk target processing
ifeq ($(TARGET),gtk3)
diff --git a/content/handlers/javascript/duktape/Makefile
b/content/handlers/javascript/duktape/Makefile
index 89f83b1..37e33d5 100644
--- a/content/handlers/javascript/duktape/Makefile
+++ b/content/handlers/javascript/duktape/Makefile
@@ -15,7 +15,6 @@ $(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile:
content/handlers/javas
$(Q)mkdir -p $(OBJROOT)/duktape
$(VQ)echo " GENBIND: $<"
$(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $<
$(OBJROOT)/duktape
- $(VQ)echo " GENBIND: completed"
# create unimplemented report for doxygen
Docs/UnimplementedJavascript.txt:
content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
