Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7148d165a57695a6ba6c1c66f883d644d47675ba
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7148d165a57695a6ba6c1c66f883d644d47675ba
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7148d165a57695a6ba6c1c66f883d644d47675ba
The branch, master has been updated
via 7148d165a57695a6ba6c1c66f883d644d47675ba (commit)
from d8977f781478f67ed7484d0deaab5c3b815271f2 (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=7148d165a57695a6ba6c1c66f883d644d47675ba
commit 7148d165a57695a6ba6c1c66f883d644d47675ba
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: conditionally demand ARMEABISupport in !Run
Will only be enabled if an EABI-aware compiler is used to build
the code. At some point, a suitable copy of ARMEABISupport needs
adding to the supplied !System.400.Modules along with licensing
information in the 3rdParty directory.
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 1708220..2b59591 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -114,6 +114,9 @@ MESSAGES_FILTER=ro
$(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET)
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
+ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
+ $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' $@
+endif
$(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Help
$(VQ)echo " CP: $@"
diff --git a/frontends/riscos/Makefile.tools b/frontends/riscos/Makefile.tools
index 8ef4dd0..a5b5cca 100644
--- a/frontends/riscos/Makefile.tools
+++ b/frontends/riscos/Makefile.tools
@@ -16,6 +16,7 @@ ifeq ($(HOST),riscos)
EXEEXT :=
PKG_CONFIG :=
ZIP := zip
+ SED :=
else
# Cross-build for RO
# Four options are available:
@@ -95,4 +96,5 @@ else
CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
PKG_CONFIG =
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
ZIP := $(GCCSDK_INSTALL_CROSSBIN)/zip
+ SED := sed
endif
diff --git a/frontends/riscos/scripts/Run b/frontends/riscos/scripts/Run
index 94aa933..cb78e90 100644
--- a/frontends/riscos/scripts/Run
+++ b/frontends/riscos/scripts/Run
@@ -68,6 +68,10 @@ RMEnsure DrawFile 1.30 Error NetSurf requires the DrawFile
module. This can be d
RMEnsure SharedUnixLibrary 1.07 NetSurfRMLoad System:Modules.SharedULib
RMEnsure SharedUnixLibrary 1.07 Error NetSurf requires SharedUnixLibrary 1.07
or later. Please use the RISC OS Configure app to update the computer's !System
directory from the NetSurf archive.
+| Ensure ARMEABISupport is installed
+|RMEnsure ARMEABISupport 1.04 NetSurfRMLoad System:Modules.ARMEABISupport
+|RMEnsure ARMEABISupport 1.04 Error NetSurf requires ARMEABISupport 1.04 or
later. Please use the RISC OS Configure app to update the computer's !System
directory from the NetSurf archive.
+
| Load AcornURI if it isn't already
Unset NetSurf$Start_URI_Handler
RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler 1
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/Makefile | 3 +++
frontends/riscos/Makefile.tools | 2 ++
frontends/riscos/scripts/Run | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 1708220..2b59591 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -114,6 +114,9 @@ MESSAGES_FILTER=ro
$(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET)
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
+ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
+ $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' $@
+endif
$(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT):
$(FRONTEND_SOURCE_DIR)/scripts/Help
$(VQ)echo " CP: $@"
diff --git a/frontends/riscos/Makefile.tools b/frontends/riscos/Makefile.tools
index 8ef4dd0..a5b5cca 100644
--- a/frontends/riscos/Makefile.tools
+++ b/frontends/riscos/Makefile.tools
@@ -16,6 +16,7 @@ ifeq ($(HOST),riscos)
EXEEXT :=
PKG_CONFIG :=
ZIP := zip
+ SED :=
else
# Cross-build for RO
# Four options are available:
@@ -95,4 +96,5 @@ else
CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
PKG_CONFIG =
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
ZIP := $(GCCSDK_INSTALL_CROSSBIN)/zip
+ SED := sed
endif
diff --git a/frontends/riscos/scripts/Run b/frontends/riscos/scripts/Run
index 94aa933..cb78e90 100644
--- a/frontends/riscos/scripts/Run
+++ b/frontends/riscos/scripts/Run
@@ -68,6 +68,10 @@ RMEnsure DrawFile 1.30 Error NetSurf requires the DrawFile
module. This can be d
RMEnsure SharedUnixLibrary 1.07 NetSurfRMLoad System:Modules.SharedULib
RMEnsure SharedUnixLibrary 1.07 Error NetSurf requires SharedUnixLibrary 1.07
or later. Please use the RISC OS Configure app to update the computer's !System
directory from the NetSurf archive.
+| Ensure ARMEABISupport is installed
+|RMEnsure ARMEABISupport 1.04 NetSurfRMLoad System:Modules.ARMEABISupport
+|RMEnsure ARMEABISupport 1.04 Error NetSurf requires ARMEABISupport 1.04 or
later. Please use the RISC OS Configure app to update the computer's !System
directory from the NetSurf archive.
+
| Load AcornURI if it isn't already
Unset NetSurf$Start_URI_Handler
RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler 1
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
