Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/1ae4a325bfdab7e6ebc51a402d662e962972f793
...commit
http://git.netsurf-browser.org/toolchains.git/commit/1ae4a325bfdab7e6ebc51a402d662e962972f793
...tree
http://git.netsurf-browser.org/toolchains.git/tree/1ae4a325bfdab7e6ebc51a402d662e962972f793
The branch, master has been updated
via 1ae4a325bfdab7e6ebc51a402d662e962972f793 (commit)
via 75fc5578376cbf7f7a3ff7248230812ac32262f9 (commit)
from 771caf281312d5f476dd5c81b3a0cd440215057d (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/commitdiff/1ae4a325bfdab7e6ebc51a402d662e962972f793
commit 1ae4a325bfdab7e6ebc51a402d662e962972f793
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add ldg and windom libraries for mint build
diff --git a/sdk/Makefile b/sdk/Makefile
index 9524198..904f6f5 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -35,6 +35,7 @@ VERSION_LIBCARES := 1.9.1
VERSION_LIBCURL := 7.27.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
+VERSION_LDG := 2.32
VERSION_WINDOM := 2.0.1
# Path
@@ -78,7 +79,7 @@ endif
ifeq ($(TARGET),m68k-atari-mint)
EXTRAARGS_LIBXML := --enable-ipv6=no
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS))
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS)
ldg.d windom.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares
endif
@@ -172,6 +173,38 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz:
wget -q -O $@
"http://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
+# atari windom library
+$(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d
+ mkdir -p $(BUILDDIR)/windom
+ cd $(BUILDDIR)/windom && unzip $(SOURCEDIR)/windom-$(VERSION_WINDOM).zip
+ $(env) make -C $(BUILDDIR)/windom/windom-$(VERSION_WINDOM)-1/src -f
gcc.mak CROSS=yes M68K_ATARI_MINT_CFLAGS="-I$(GCCSDK_INSTALL_ENV)/include/"
+ $(env) make -C $(BUILDDIR)/windom/windom-$(VERSION_WINDOM)-1/src -f
gcc.mak CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV) install
+ touch $@
+
+$(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip
+ touch $@
+
+$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
+ wget -q -O $@
"http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
+
+# atari ldg library
+$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
+ mkdir -p $(BUILDDIR)/ldg
+ cd $(BUILDDIR)/ldg && unzip $(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ $(env) make -C $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/src/devel -f gcc.mak
CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV)
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/lib/gcc/libldg.a
$(GCCSDK_INSTALL_ENV)/lib/
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg.h
$(GCCSDK_INSTALL_ENV)/include/ldg.h
+ mkdir -p $(GCCSDK_INSTALL_ENV)/include/ldg
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg/mem.h
$(GCCSDK_INSTALL_ENV)/include/ldg/
+ touch $@
+
+$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ touch $@
+
+$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
+ wget -q -O $@ "http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip"
+
+
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
commitdiff
http://git.netsurf-browser.org/toolchains.git/commitdiff/75fc5578376cbf7f7a3ff7248230812ac32262f9
commit 75fc5578376cbf7f7a3ff7248230812ac32262f9
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
improve handling of SDK_ITEMS
diff --git a/sdk/Makefile b/sdk/Makefile
index 8e76560..9524198 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -35,6 +35,7 @@ VERSION_LIBCARES := 1.9.1
VERSION_LIBCURL := 7.27.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
+VERSION_WINDOM := 2.0.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -65,38 +66,37 @@ BUILDSTEPS := $(BUILDDIR)/build-steps
# Compute the SDK components
SDK_ITEMS :=
-COMMON_SDK_ITEMS := $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2.d
$(BUILDSTEPS)/openssl.d \
- $(BUILDSTEPS)/libpng.d $(BUILDSTEPS)/libjpeg.d
$(BUILDSTEPS)/liblcms.d \
- $(BUILDSTEPS)/libmng.d $(BUILDSTEPS)/libcares.d
$(BUILDSTEPS)/libcurl.d
+COMMON_SDK_ITEMS := zlib.d libxml2.d openssl.d libpng.d libjpeg.d liblcms.d \
+ libmng.d libcares.d libcurl.d
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares
endif
ifeq ($(TARGET),m68k-atari-mint)
EXTRAARGS_LIBXML := --enable-ipv6=no
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares
endif
ifeq ($(TARGET),ppc-amigaos)
- SDK_ITEMS := $(BUILDSTEPS)/libtre.d $(BUILDSTEPS)/libpbl.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libtre.d libpbl.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
$(warning Using ancient libcurl)
VERSION_LIBCURL := 7.21.3
endif
ifeq ($(TARGET),i686-w64-mingw32)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libgnurx.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libtre.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
endif
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index 8e76560..904f6f5 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -35,6 +35,8 @@ VERSION_LIBCARES := 1.9.1
VERSION_LIBCURL := 7.27.0
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
+VERSION_LDG := 2.32
+VERSION_WINDOM := 2.0.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -65,38 +67,37 @@ BUILDSTEPS := $(BUILDDIR)/build-steps
# Compute the SDK components
SDK_ITEMS :=
-COMMON_SDK_ITEMS := $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2.d
$(BUILDSTEPS)/openssl.d \
- $(BUILDSTEPS)/libpng.d $(BUILDSTEPS)/libjpeg.d
$(BUILDSTEPS)/liblcms.d \
- $(BUILDSTEPS)/libmng.d $(BUILDSTEPS)/libcares.d
$(BUILDSTEPS)/libcurl.d
+COMMON_SDK_ITEMS := zlib.d libxml2.d openssl.d libpng.d libjpeg.d liblcms.d \
+ libmng.d libcares.d libcurl.d
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares
endif
ifeq ($(TARGET),m68k-atari-mint)
EXTRAARGS_LIBXML := --enable-ipv6=no
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS)
ldg.d windom.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares
endif
ifeq ($(TARGET),ppc-amigaos)
- SDK_ITEMS := $(BUILDSTEPS)/libtre.d $(BUILDSTEPS)/libpbl.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libtre.d libpbl.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
$(warning Using ancient libcurl)
VERSION_LIBCURL := 7.21.3
endif
ifeq ($(TARGET),i686-w64-mingw32)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libgnurx.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libtre.d
$(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d
$(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
endif
@@ -172,6 +173,38 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz:
wget -q -O $@
"http://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz"
+# atari windom library
+$(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d
+ mkdir -p $(BUILDDIR)/windom
+ cd $(BUILDDIR)/windom && unzip $(SOURCEDIR)/windom-$(VERSION_WINDOM).zip
+ $(env) make -C $(BUILDDIR)/windom/windom-$(VERSION_WINDOM)-1/src -f
gcc.mak CROSS=yes M68K_ATARI_MINT_CFLAGS="-I$(GCCSDK_INSTALL_ENV)/include/"
+ $(env) make -C $(BUILDDIR)/windom/windom-$(VERSION_WINDOM)-1/src -f
gcc.mak CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV) install
+ touch $@
+
+$(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip
+ touch $@
+
+$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
+ wget -q -O $@
"http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip"
+
+# atari ldg library
+$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
+ mkdir -p $(BUILDDIR)/ldg
+ cd $(BUILDDIR)/ldg && unzip $(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ $(env) make -C $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/src/devel -f gcc.mak
CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV)
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/lib/gcc/libldg.a
$(GCCSDK_INSTALL_ENV)/lib/
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg.h
$(GCCSDK_INSTALL_ENV)/include/ldg.h
+ mkdir -p $(GCCSDK_INSTALL_ENV)/include/ldg
+ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg/mem.h
$(GCCSDK_INSTALL_ENV)/include/ldg/
+ touch $@
+
+$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip
+ touch $@
+
+$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
+ wget -q -O $@ "http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip"
+
+
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
