Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d8977f781478f67ed7484d0deaab5c3b815271f2
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d8977f781478f67ed7484d0deaab5c3b815271f2
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d8977f781478f67ed7484d0deaab5c3b815271f2
The branch, master has been updated
via d8977f781478f67ed7484d0deaab5c3b815271f2 (commit)
via 692da438554a34ad18f346e8b491012fc2afa9a3 (commit)
via 7a767da220c745dfc58a1c30281c3d1cb10d949a (commit)
via 2f56bc568de9981bba35e798c30458d9cce2d704 (commit)
from 217f71357e16c5ffea409566ffb70e2ae7a4f361 (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=d8977f781478f67ed7484d0deaab5c3b815271f2
commit d8977f781478f67ed7484d0deaab5c3b815271f2
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: generate unwind tables for EABI builds
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 31a7f4a..1708220 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -22,6 +22,9 @@ RESOURCES = $(TPD_RISCOS)
CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
-mpoke-function-name -fno-strict-aliasing
+ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
+ CFLAGS += -funwind-tables
+endif
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
ifeq ($(HOST),riscos)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=692da438554a34ad18f346e8b491012fc2afa9a3
commit 692da438554a34ad18f346e8b491012fc2afa9a3
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
BuildSystem: make package step depend on POSTEXES
The POSTEXE stages might add more stuff to the package contents,
so ensure they have completed before starting to package things up.
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 99745c9..f537a11 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -80,7 +80,7 @@ AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/*
AMIGA_PKG_DIR := $(FRONTEND_SOURCE_DIR)/pkg
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: $(EXETARGET)
+netsurf.lha: $(EXETARGET) $(POSTEXES)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 6de15b6..2f6d711 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -161,7 +161,7 @@ $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME):
package-atari: $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME) $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
-$(PKGNAME): $(EXETARGET)
+$(PKGNAME): $(EXETARGET) $(POSTEXES)
ifneq ($(strip $(STRIP)),)
$(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP)
$(Q)$(STRIP) $(EXETARGET)
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 46f12ec..81c9326 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -151,7 +151,7 @@ install-beos:
package-beos: $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
-$(PKGNAME): $(EXETARGET)
+$(PKGNAME): $(EXETARGET) $(POSTEXES)
$(Q)rm -rf $(HAIKU_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
$(Q)$(MKDIR) $(HAIKU_TARGET_DIR)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 79e6fc4..31a7f4a 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -174,7 +174,7 @@ install-riscos:
package-riscos: netsurf.zip
-netsurf.zip: $(EXETARGET)
+netsurf.zip: $(EXETARGET) $(POSTEXES)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
$(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 4e74edd..524f716 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -90,7 +90,7 @@ $(OBJROOT)/messages-en: $(MESSAGES_TARGET)/en/Messages
$(VQ)echo " MSGCP: $< $@"
$(Q)$(INSTALL) -m 644 -T $< $@
-netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
+netsurf-installer.exe: $(EXETARGET) $(POSTEXES) $(WIN_RES_INS_OBJ)
$(VQ)echo "MAKENSIS: $@"
$(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT)
-DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ)
-DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@
$(FRONTEND_RESOURCES_DIR)/installer.nsi
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7a767da220c745dfc58a1c30281c3d1cb10d949a
commit 7a767da220c745dfc58a1c30281c3d1cb10d949a
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Buildsystem: support arm-riscos-gnueabi
diff --git a/frontends/riscos/Makefile.tools b/frontends/riscos/Makefile.tools
index 19a2e77..8ef4dd0 100644
--- a/frontends/riscos/Makefile.tools
+++ b/frontends/riscos/Makefile.tools
@@ -18,25 +18,30 @@ ifeq ($(HOST),riscos)
ZIP := zip
else
# Cross-build for RO
- # Three options are available:
- # a. GCCSDK 3.4.6 - AOF (machine: arm-unknown-riscos)
- # b. GCCSDK 4 - ELF (machine: arm-unknown-riscos)
- # c. GCCSDK 8+ - ELF, using EABI (machine: arm-riscos-gnueabihf)
+ # Four options are available:
+ # a. GCCSDK 3.4.6 - AOF (machine:
arm-unknown-riscos)
+ # b. GCCSDK 4 - ELF (machine:
arm-unknown-riscos)
+ # c. GCCSDK 8+ - ELF, using soft-float EABI (machine:
arm-riscos-gnueabi)
+ # d. GCCSDK 8+ - ELF, using hard-float EABI (machine:
arm-riscos-gnueabihf)
# GCCSDK 3.4.6 and 4 are distinguished by GCCSDK 3.4.6 binary names
# not having the machine prefix (e.g. gcc), whereas GCCSDK 4 binaries
# do (e.g. arm-unknown-riscos-gcc).
# Search for the toolchain install locations if we haven't been told
- # The search order prefers GCCSDK 3.4.6/4 over 8+.
+ # The search order prefers GCCSDK 3.4.6/4 over 8+ and soft-float over hard.
ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/env),)
GCCSDK_INSTALL_ENV := /opt/netsurf/arm-unknown-riscos/env
else
- ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/env),)
- GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabihf/env
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabi/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabi/env
else
- # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
- GCCSDK_INSTALL_ENV := /home/riscos/env
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabihf/env
+ else
+ # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
+ GCCSDK_INSTALL_ENV := /home/riscos/env
+ endif
endif
endif
endif
@@ -45,11 +50,15 @@ else
ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/cross/bin),)
GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-unknown-riscos/cross/bin
else
- ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/cross/bin),)
- GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-riscos-gnueabihf/cross/bin
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabi/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-riscos-gnueabi/cross/bin
else
- # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
- GCCSDK_INSTALL_CROSSBIN := /home/riscos/cross/bin
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN :=
/opt/netsurf/arm-riscos-gnueabihf/cross/bin
+ else
+ # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
+ GCCSDK_INSTALL_CROSSBIN := /home/riscos/cross/bin
+ endif
endif
endif
endif
@@ -68,9 +77,12 @@ else
EXEEXT := ,e1f
ELF2AIF := $(GCCSDK_INSTALL_CROSSBIN)/elf2aif
else
- ifneq (,$(findstring arm-riscos-gnueabihf-gcc,$(CC)))
+ ifneq (,$(findstring arm-riscos-gnueabi,$(CC)))
# GCCSDK 8+
SUBTARGET := -elfeabi
+ ifneq (,$(findstring gnueabihf,$(CC)))
+ SUBTARGET := -elfeabihf
+ endif
EXEEXT := ,e1f
ELF2AIF := $(GCCSDK_INSTALL_CROSSBIN)/elf2aif -e
else
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2f56bc568de9981bba35e798c30458d9cce2d704
commit 2f56bc568de9981bba35e798c30458d9cce2d704
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
env.sh: support arm-riscos-gnueabi
diff --git a/docs/env.sh b/docs/env.sh
index a9e52a3..b7d33fc 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -284,7 +284,7 @@ case "${HOST}" in
# libraries required for the Darwin target abi
NS_FRONTEND_LIBS="libsvgtiny libnsfb"
;;
- arm-unknown-riscos|arm-riscos-gnueabihf)
+ arm-unknown-riscos|arm-riscos-gnueabi*)
# tools required to build the browser for RISC OS
NS_TOOLS="nsgenbind"
# libraries required for the risc os target abi
-----------------------------------------------------------------------
Summary of changes:
docs/env.sh | 2 +-
frontends/amiga/Makefile | 2 +-
frontends/atari/Makefile | 2 +-
frontends/beos/Makefile | 2 +-
frontends/riscos/Makefile | 5 ++++-
frontends/riscos/Makefile.tools | 40 +++++++++++++++++++++++++--------------
frontends/windows/Makefile | 2 +-
7 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/docs/env.sh b/docs/env.sh
index a9e52a3..b7d33fc 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -284,7 +284,7 @@ case "${HOST}" in
# libraries required for the Darwin target abi
NS_FRONTEND_LIBS="libsvgtiny libnsfb"
;;
- arm-unknown-riscos|arm-riscos-gnueabihf)
+ arm-unknown-riscos|arm-riscos-gnueabi*)
# tools required to build the browser for RISC OS
NS_TOOLS="nsgenbind"
# libraries required for the risc os target abi
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 99745c9..f537a11 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -80,7 +80,7 @@ AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/*
AMIGA_PKG_DIR := $(FRONTEND_SOURCE_DIR)/pkg
AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga
-netsurf.lha: $(EXETARGET)
+netsurf.lha: $(EXETARGET) $(POSTEXES)
$(VQ)echo Creating netsurf.lha
$(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR)
$(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 6de15b6..2f6d711 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -161,7 +161,7 @@ $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME):
package-atari: $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME) $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
-$(PKGNAME): $(EXETARGET)
+$(PKGNAME): $(EXETARGET) $(POSTEXES)
ifneq ($(strip $(STRIP)),)
$(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP)
$(Q)$(STRIP) $(EXETARGET)
diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile
index 46f12ec..81c9326 100644
--- a/frontends/beos/Makefile
+++ b/frontends/beos/Makefile
@@ -151,7 +151,7 @@ install-beos:
package-beos: $(PKGNAME)
$(VQ)echo Creating $(PKGNAME)
-$(PKGNAME): $(EXETARGET)
+$(PKGNAME): $(EXETARGET) $(POSTEXES)
$(Q)rm -rf $(HAIKU_TARGET_DIR)
$(Q)rm -rf $(PKGNAME)
$(Q)$(MKDIR) $(HAIKU_TARGET_DIR)
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile
index 79e6fc4..1708220 100644
--- a/frontends/riscos/Makefile
+++ b/frontends/riscos/Makefile
@@ -22,6 +22,9 @@ RESOURCES = $(TPD_RISCOS)
CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
-mpoke-function-name -fno-strict-aliasing
+ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi)
+ CFLAGS += -funwind-tables
+endif
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
ifeq ($(HOST),riscos)
@@ -174,7 +177,7 @@ install-riscos:
package-riscos: netsurf.zip
-netsurf.zip: $(EXETARGET)
+netsurf.zip: $(EXETARGET) $(POSTEXES)
$(eval $@_TMPDIR := $(shell mktemp -d))
$(Q) $(RM) $@
$(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf
diff --git a/frontends/riscos/Makefile.tools b/frontends/riscos/Makefile.tools
index 19a2e77..8ef4dd0 100644
--- a/frontends/riscos/Makefile.tools
+++ b/frontends/riscos/Makefile.tools
@@ -18,25 +18,30 @@ ifeq ($(HOST),riscos)
ZIP := zip
else
# Cross-build for RO
- # Three options are available:
- # a. GCCSDK 3.4.6 - AOF (machine: arm-unknown-riscos)
- # b. GCCSDK 4 - ELF (machine: arm-unknown-riscos)
- # c. GCCSDK 8+ - ELF, using EABI (machine: arm-riscos-gnueabihf)
+ # Four options are available:
+ # a. GCCSDK 3.4.6 - AOF (machine:
arm-unknown-riscos)
+ # b. GCCSDK 4 - ELF (machine:
arm-unknown-riscos)
+ # c. GCCSDK 8+ - ELF, using soft-float EABI (machine:
arm-riscos-gnueabi)
+ # d. GCCSDK 8+ - ELF, using hard-float EABI (machine:
arm-riscos-gnueabihf)
# GCCSDK 3.4.6 and 4 are distinguished by GCCSDK 3.4.6 binary names
# not having the machine prefix (e.g. gcc), whereas GCCSDK 4 binaries
# do (e.g. arm-unknown-riscos-gcc).
# Search for the toolchain install locations if we haven't been told
- # The search order prefers GCCSDK 3.4.6/4 over 8+.
+ # The search order prefers GCCSDK 3.4.6/4 over 8+ and soft-float over hard.
ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/env),)
GCCSDK_INSTALL_ENV := /opt/netsurf/arm-unknown-riscos/env
else
- ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/env),)
- GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabihf/env
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabi/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabi/env
else
- # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
- GCCSDK_INSTALL_ENV := /home/riscos/env
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/arm-riscos-gnueabihf/env
+ else
+ # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
+ GCCSDK_INSTALL_ENV := /home/riscos/env
+ endif
endif
endif
endif
@@ -45,11 +50,15 @@ else
ifneq ($(realpath /opt/netsurf/arm-unknown-riscos/cross/bin),)
GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-unknown-riscos/cross/bin
else
- ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/cross/bin),)
- GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-riscos-gnueabihf/cross/bin
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabi/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/arm-riscos-gnueabi/cross/bin
else
- # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
- GCCSDK_INSTALL_CROSSBIN := /home/riscos/cross/bin
+ ifneq ($(realpath /opt/netsurf/arm-riscos-gnueabihf/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN :=
/opt/netsurf/arm-riscos-gnueabihf/cross/bin
+ else
+ # No NetSurf-specific toolchain found: try the "normal" GCCSDK path
+ GCCSDK_INSTALL_CROSSBIN := /home/riscos/cross/bin
+ endif
endif
endif
endif
@@ -68,9 +77,12 @@ else
EXEEXT := ,e1f
ELF2AIF := $(GCCSDK_INSTALL_CROSSBIN)/elf2aif
else
- ifneq (,$(findstring arm-riscos-gnueabihf-gcc,$(CC)))
+ ifneq (,$(findstring arm-riscos-gnueabi,$(CC)))
# GCCSDK 8+
SUBTARGET := -elfeabi
+ ifneq (,$(findstring gnueabihf,$(CC)))
+ SUBTARGET := -elfeabihf
+ endif
EXEEXT := ,e1f
ELF2AIF := $(GCCSDK_INSTALL_CROSSBIN)/elf2aif -e
else
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 4e74edd..524f716 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -90,7 +90,7 @@ $(OBJROOT)/messages-en: $(MESSAGES_TARGET)/en/Messages
$(VQ)echo " MSGCP: $< $@"
$(Q)$(INSTALL) -m 644 -T $< $@
-netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
+netsurf-installer.exe: $(EXETARGET) $(POSTEXES) $(WIN_RES_INS_OBJ)
$(VQ)echo "MAKENSIS: $@"
$(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT)
-DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ)
-DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@
$(FRONTEND_RESOURCES_DIR)/installer.nsi
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
