Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/b6553680a1c58e3b68124053bee89f3e15b76131
...commit
http://git.netsurf-browser.org/toolchains.git/commit/b6553680a1c58e3b68124053bee89f3e15b76131
...tree
http://git.netsurf-browser.org/toolchains.git/tree/b6553680a1c58e3b68124053bee89f3e15b76131
The branch, master has been updated
via b6553680a1c58e3b68124053bee89f3e15b76131 (commit)
via 3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2 (commit)
from 9077b37964481083fad09377e2d7cb391b3ba85c (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=b6553680a1c58e3b68124053bee89f3e15b76131
commit b6553680a1c58e3b68124053bee89f3e15b76131
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
libexpat/m68k-unknown-amigaos: explicit -lgcc
For whatever reason (and this really should not be necessary),
linking will fail without doing this as libgcc gets evaluated
by ld after libm, and thus cannot resolve the symbols it needs.
diff --git a/sdk/Makefile b/sdk/Makefile
index 82cdc62..4c8c6a7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -171,7 +171,10 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
else
LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API"
LIBS="-lm"
endif
- LIBEXPAT_ENV := LDFLAGS="-lm"
+ # XXX: libgcc is meant to be implied, but for some reason that
+ # results in ld evaluating it after libm and thus failing to find symbols.
+ # Hack around it by forcing the link order here.
+ LIBEXPAT_ENV := LDFLAGS="-lgcc -lm"
endif
ifeq ($(SDK_ITEMS),)
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2
commit 3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
libexpat/m68k-unknown-amigaos: patch out strtoull
For whatever reason the libc in the toolchain does not provide
this (despite there being an implementation available). This
results in the xmlwf too failing to link. Work around this by
replacing strtoull with strtoul.
diff --git a/sdk/Makefile b/sdk/Makefile
index da37722..82cdc62 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -535,13 +535,16 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
# libexpat
$(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d
- mkdir -p $(BUILDDIR)/libexpat
- cd $(BUILDDIR)/libexpat && tar xaf
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env)
$(LIBEXPAT_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env)
$(LIBEXPAT_ENV) make install
touch $@
$(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
+ mkdir -p $(BUILDDIR)/libexpat
+ cd $(BUILDDIR)/libexpat && tar xaf
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
+ifneq ($(realpath $(RECIPES)/patches/libexpat/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/libexpat/$(TARGET)/*.p` ; do $(PATCH)
-d $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) -p0 <$$p ; done
+endif
touch $@
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2:
diff --git
a/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
new file mode 100644
index 0000000..c9da0e8
--- /dev/null
+++ b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
@@ -0,0 +1,9 @@
+--- xmlwf/xmltchar.h.orig 2017-10-10 15:19:45.611896396 +0100
++++ xmlwf/xmltchar.h 2017-10-17 15:42:25.304921197 +0100
+@@ -75,5 +75,5 @@
+ # define tremove remove
+ # define tchar char
+ # define tcstof strtof
+-# define tcstoull strtoull
++# define tcstoull strtoul
+ #endif /* not XML_UNICODE */
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 12 +++++++++---
.../libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p | 9 +++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644
sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
diff --git a/sdk/Makefile b/sdk/Makefile
index da37722..4c8c6a7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -171,7 +171,10 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
else
LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API"
LIBS="-lm"
endif
- LIBEXPAT_ENV := LDFLAGS="-lm"
+ # XXX: libgcc is meant to be implied, but for some reason that
+ # results in ld evaluating it after libm and thus failing to find symbols.
+ # Hack around it by forcing the link order here.
+ LIBEXPAT_ENV := LDFLAGS="-lgcc -lm"
endif
ifeq ($(SDK_ITEMS),)
@@ -535,13 +538,16 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
# libexpat
$(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d
- mkdir -p $(BUILDDIR)/libexpat
- cd $(BUILDDIR)/libexpat && tar xaf
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env)
$(LIBEXPAT_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET)
--host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env)
$(LIBEXPAT_ENV) make install
touch $@
$(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
+ mkdir -p $(BUILDDIR)/libexpat
+ cd $(BUILDDIR)/libexpat && tar xaf
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2
+ifneq ($(realpath $(RECIPES)/patches/libexpat/$(TARGET)),)
+ for p in `ls $(RECIPES)/patches/libexpat/$(TARGET)/*.p` ; do $(PATCH)
-d $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) -p0 <$$p ; done
+endif
touch $@
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2:
diff --git
a/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
new file mode 100644
index 0000000..c9da0e8
--- /dev/null
+++ b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p
@@ -0,0 +1,9 @@
+--- xmlwf/xmltchar.h.orig 2017-10-10 15:19:45.611896396 +0100
++++ xmlwf/xmltchar.h 2017-10-17 15:42:25.304921197 +0100
+@@ -75,5 +75,5 @@
+ # define tremove remove
+ # define tchar char
+ # define tcstof strtof
+-# define tcstoull strtoull
++# define tcstoull strtoul
+ #endif /* not XML_UNICODE */
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
