diff options
author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 18:18:23 +0000 |
---|---|---|
committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 18:18:23 +0000 |
commit | 3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2 (patch) | |
tree | 14c9dc2829b2b30decb3da42d1a139b6bce0873b | |
parent | 9077b37964481083fad09377e2d7cb391b3ba85c (diff) | |
download | toolchains-3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2.tar.gz toolchains-3bbbb9cfe0c2b2d22986bbf4455f0e772f64bbb2.tar.bz2 |
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.
-rw-r--r-- | sdk/Makefile | 7 | ||||
-rw-r--r-- | sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p | 9 |
2 files changed, 14 insertions, 2 deletions
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 */ |