Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/bffb59db32fe1458ebc9c35d768a485f3143eef3
...commit
http://git.netsurf-browser.org/toolchains.git/commit/bffb59db32fe1458ebc9c35d768a485f3143eef3
...tree
http://git.netsurf-browser.org/toolchains.git/tree/bffb59db32fe1458ebc9c35d768a485f3143eef3
The branch, master has been updated
via bffb59db32fe1458ebc9c35d768a485f3143eef3 (commit)
from 73df8f877a8ae39ce2e7a56da76ded9b243e59f6 (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/bffb59db32fe1458ebc9c35d768a485f3143eef3
commit bffb59db32fe1458ebc9c35d768a485f3143eef3
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
add regex library to windows build
diff --git a/sdk/Makefile b/sdk/Makefile
index ec61944..0c3afc3 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -23,6 +23,7 @@ VERSION_LIBLCMS := 2.1
VERSION_LIBMNG := 1.0.10
VERSION_LIBCARES := 1.9.1
VERSION_LIBCURL := 7.26.0
+VERSION_LIBGNURX := 2.5.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -80,7 +81,7 @@ ifeq ($(TARGET),ppc-amigaos)
endif
ifeq ($(TARGET),i686-w64-mingw32)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libgnurx.d
$(COMMON_SDK_ITEMS)
endif
ifeq ($(SDK_ITEMS),)
@@ -139,6 +140,22 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libiconv-$(
$(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
wget -q -O $@ http://ftp.gnu.org/pub/gnu/libiconv/$(subst
$(SOURCEDIR)/,,$@)
+# libgnurx
+$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
+ mkdir -p $(BUILDDIR)/libgnurx
+ cd $(BUILDDIR)/libgnurx && tar xzf
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ for p in `ls $(RECIPES)/patches/libgnurx/*.p` ; do patch -d
$(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) -p0 <$$p ; done
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET)
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
make
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
make install
+ touch $@
+
+$(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ touch $@
+
+$(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?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fmingw%2Ffiles%2FOther%2FUserContributed%2Fregex%2Fmingw-regex-2.5.1%2F&ts=1343071687&use_mirror=freefr"
+
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index ec61944..0c3afc3 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -23,6 +23,7 @@ VERSION_LIBLCMS := 2.1
VERSION_LIBMNG := 1.0.10
VERSION_LIBCARES := 1.9.1
VERSION_LIBCURL := 7.26.0
+VERSION_LIBGNURX := 2.5.1
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -80,7 +81,7 @@ ifeq ($(TARGET),ppc-amigaos)
endif
ifeq ($(TARGET),i686-w64-mingw32)
- SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(COMMON_SDK_ITEMS)
+ SDK_ITEMS := $(BUILDSTEPS)/libiconv.d $(BUILDSTEPS)/libgnurx.d
$(COMMON_SDK_ITEMS)
endif
ifeq ($(SDK_ITEMS),)
@@ -139,6 +140,22 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libiconv-$(
$(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
wget -q -O $@ http://ftp.gnu.org/pub/gnu/libiconv/$(subst
$(SOURCEDIR)/,,$@)
+# libgnurx
+$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
+ mkdir -p $(BUILDDIR)/libgnurx
+ cd $(BUILDDIR)/libgnurx && tar xzf
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ for p in `ls $(RECIPES)/patches/libgnurx/*.p` ; do patch -d
$(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) -p0 <$$p ; done
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET)
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
make
+ cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env)
make install
+ touch $@
+
+$(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ touch $@
+
+$(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?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fmingw%2Ffiles%2FOther%2FUserContributed%2Fregex%2Fmingw-regex-2.5.1%2F&ts=1343071687&use_mirror=freefr"
+
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
