Gitweb links:

...log 
http://git.netsurf-browser.org/toolchains.git/shortlog/b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba
...commit 
http://git.netsurf-browser.org/toolchains.git/commit/b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba
...tree 
http://git.netsurf-browser.org/toolchains.git/tree/b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba

The branch, master has been updated
       via  b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba (commit)
      from  97654a18425898ade8c97b7985791d86565b885c (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=b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba
commit b9ebe11d7bd08cf39bd9b5bae1a94c34c9602dba
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    SDK/c-ares: m68k-unknown-amigaos needs -lm

diff --git a/sdk/Makefile b/sdk/Makefile
index ecbb1ce..7b4a036 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -213,6 +213,7 @@ endif
 ifeq ($(TARGET),m68k-unknown-amigaos)
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d 
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
   EXTRAARGS_LIBCARES := --disable-shared --without-random
+  LIBCARES_ENV := LIBS="-lm"
   # XXX: reinstate amissl when there's v5 sdk?
   #LIBCURL_SSL := amissl
   EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random 
--disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6
@@ -561,7 +562,7 @@ $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d 
$(BUILDSTEPS)/libcares-src.d
 ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),)
        for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do $(PATCH) 
-d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
 endif
-       cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) 
./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) 
$(EXTRAARGS_LIBCARES)
+       cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) 
$(LIBCARES_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) 
--host=$(TARGET) $(EXTRAARGS_LIBCARES)
        cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) make 
install
        touch $@
 


-----------------------------------------------------------------------

Summary of changes:
 sdk/Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdk/Makefile b/sdk/Makefile
index ecbb1ce..7b4a036 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -213,6 +213,7 @@ endif
 ifeq ($(TARGET),m68k-unknown-amigaos)
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d 
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
   EXTRAARGS_LIBCARES := --disable-shared --without-random
+  LIBCARES_ENV := LIBS="-lm"
   # XXX: reinstate amissl when there's v5 sdk?
   #LIBCURL_SSL := amissl
   EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random 
--disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6
@@ -561,7 +562,7 @@ $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d 
$(BUILDSTEPS)/libcares-src.d
 ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),)
        for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do $(PATCH) 
-d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
 endif
-       cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) 
./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) 
$(EXTRAARGS_LIBCARES)
+       cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) 
$(LIBCARES_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) 
--host=$(TARGET) $(EXTRAARGS_LIBCARES)
        cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) make 
install
        touch $@
 


-- 
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to