Gitweb links:
...log
http://git.netsurf-browser.org/ttf2f.git/shortlog/caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a
...commit
http://git.netsurf-browser.org/ttf2f.git/commit/caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a
...tree
http://git.netsurf-browser.org/ttf2f.git/tree/caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a
The branch, master has been updated
via caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a (commit)
from 47b419d2dec6285bf92c7b4c180d103b8bdf24fd (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/ttf2f.git/commit/?id=caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a
commit caa9c7239d6d608c4c3d4e71e7d08d4de8cc6e4a
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Tweak RISC OS host detection for new tooling.
The new toolchain has a different machine triplet, so update the
things that care about it to work either way.
Additionally, ensure that elf2aif is passed the right flags when
building for EABI (if not, it will fail hard).
diff --git a/Makefile b/Makefile
index 75eff82..39d8ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ CFLAGS := $(CFLAGS) -std=c99 \
# Freetype2
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static)
else
@@ -39,7 +39,7 @@ endif
# OSLib (RISC OS target only)
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static
LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static
endif
@@ -47,7 +47,7 @@ endif
include $(NSBUILD)/Makefile.top
-ifeq ($(HOST),arm-unknown-riscos)
+ifeq ($(findstring -riscos,$(HOST)),-riscos)
realoutput := $(OUTPUT)
e1f := ,e1f
ifeq ($(EXEEXT),$(e1f))
@@ -56,9 +56,14 @@ ifeq ($(HOST),arm-unknown-riscos)
POST_TARGETS := $(realoutput) $(POST_TARGETS)
+ ELF2AIF_FLAGS :=
+ ifeq ($(HOST),arm-riscos-gnueabihf)
+ ELF2AIF_FLAGS := -e $(ELF2AIF_FLAGS)
+ endif
+
$(realoutput): $(OUTPUT)
$(Q)echo " ELF2AIF: $@"
- $(Q)$(dir $(CC))elf2aif $(OUTPUT) $@
+ $(Q)$(dir $(CC))elf2aif $(ELF2AIF_FLAGS) $(OUTPUT) $@
$(Q)echo " SQUEEZE: $@"
$(Q)$(dir $(CC))squeeze $@
diff --git a/src/Makefile b/src/Makefile
index 0265d3f..bfe8aa1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c
utils.c
ifeq ($(FRONTEND),cli)
DIR_SOURCES := $(DIR_SOURCES) cli.c
else
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
DIR_SOURCES := $(DIR_SOURCES) toolbox.c
endif
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile | 13 +++++++++----
src/Makefile | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 75eff82..39d8ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ CFLAGS := $(CFLAGS) -std=c99 \
# Freetype2
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static)
else
@@ -39,7 +39,7 @@ endif
# OSLib (RISC OS target only)
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static
LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static
endif
@@ -47,7 +47,7 @@ endif
include $(NSBUILD)/Makefile.top
-ifeq ($(HOST),arm-unknown-riscos)
+ifeq ($(findstring -riscos,$(HOST)),-riscos)
realoutput := $(OUTPUT)
e1f := ,e1f
ifeq ($(EXEEXT),$(e1f))
@@ -56,9 +56,14 @@ ifeq ($(HOST),arm-unknown-riscos)
POST_TARGETS := $(realoutput) $(POST_TARGETS)
+ ELF2AIF_FLAGS :=
+ ifeq ($(HOST),arm-riscos-gnueabihf)
+ ELF2AIF_FLAGS := -e $(ELF2AIF_FLAGS)
+ endif
+
$(realoutput): $(OUTPUT)
$(Q)echo " ELF2AIF: $@"
- $(Q)$(dir $(CC))elf2aif $(OUTPUT) $@
+ $(Q)$(dir $(CC))elf2aif $(ELF2AIF_FLAGS) $(OUTPUT) $@
$(Q)echo " SQUEEZE: $@"
$(Q)$(dir $(CC))squeeze $@
diff --git a/src/Makefile b/src/Makefile
index 0265d3f..bfe8aa1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c
utils.c
ifeq ($(FRONTEND),cli)
DIR_SOURCES := $(DIR_SOURCES) cli.c
else
- ifeq ($(HOST),arm-unknown-riscos)
+ ifeq ($(findstring -riscos,$(HOST)),-riscos)
DIR_SOURCES := $(DIR_SOURCES) toolbox.c
endif
endif
--
Truetype font to RISC OS font converter
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
