Update to build from scratch

Add basic README containing dependancies and risc os build instructions

7 files changed, 42 insertions, 56 deletions

diff --git a/README b/README
new file mode 100644
index 0000000..b964224
--- /dev/null
+++ b/README
@@ -0,0 +1,18 @@
+NetSurf Toolchain builds
+
+Pre-requisites for Debian systems
+---------------------------------
+
+	$ apt-get install build-essential autoconf automake autogen flex yacc
+
+RISC OS
+-------
+
+It is important that the output prefix (/opt/netsurf by default) is writable 
+ or use sudo to do the make
+
+	$ cd arm-unknown-riscos
+	$ make
+	$ cd ../sdk
+	$ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make
+
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 42e2753..4bbe1ca 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -59,6 +59,7 @@ $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TA
 	cd $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) && make -f unix/Makefile generic LOCAL_ZIP=-DFORRISCOS
 	cp $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION)/zip $(PREFIX)/cross/bin/zip
 	@# Yuck. Build host tooling should not be installed into the target environment
+	mkdir -p $(PREFIX)/env/bin
 	ln -fs $(PREFIX)/cross/bin/zip $(PREFIX)/env/bin/zip
 	touch $@
 
@@ -97,6 +98,7 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
 
 $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
 	cd $(BUILDDIR)/gcc4 && make
+	cd $(BUILDDIR)/gcc4 && ./install-env
 	touch $@
 
 $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
diff --git a/sdk/Makefile b/sdk/Makefile
index 776c322..6687ebd 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -12,16 +12,16 @@ ifeq ($(GCCSDK_INSTALL_CROSSBIN),)
 endif
 
 # Upstream package versions
-VERSION_ZLIB := 1.2.5
+VERSION_ZLIB := 1.2.7
 VERSION_LIBICONV := 1.13.1
 VERSION_LIBTRE := 0.8.0
 VERSION_LIBXML := 2.7.8
 VERSION_OPENSSL := 1.0.0c
-VERSION_LIBPNG := 1.4.5
+VERSION_LIBPNG := 1.4.12
 VERSION_LIBJPEG := 8b
 VERSION_LIBLCMS := 2.1
 VERSION_LIBMNG := 1.0.10
-VERSION_LIBCARES := 1.7.4
+VERSION_LIBCARES := 1.9.1
 VERSION_LIBCURL := 7.21.3
 
 # Path
@@ -152,7 +152,7 @@ $(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
 ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),)
 	for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
 endif
-	cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_LIBXML)
+	cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-python $(EXTRAARGS_LIBXML)
 	cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) make install
 	touch $@
 
@@ -261,7 +261,7 @@ $(BUILDSTEPS)/libcares-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/c-ares-$(VE
 	touch $@
 
 $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
-	wget -q -O $@ http://c-ares.haxx.se/$(subst $(SOURCEDIR)/,,$@)
+	wget -q -O $@ http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)
 
 # libcurl
 $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d
diff --git a/sdk/recipes/patches/zlib/Makefile.in.p b/sdk/recipes/patches/zlib/Makefile.in.p
deleted file mode 100644
index 3d0f7a3..0000000
--- a/sdk/recipes/patches/zlib/Makefile.in.p
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.old	2010-12-29 00:23:58.000000000 +0000
-+++ Makefile.in	2010-12-29 00:25:00.000000000 +0000
-@@ -168,7 +168,9 @@
- 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
- 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- 	cp $(STATICLIB) $(DESTDIR)$(libdir)
-+ifneq ($(SHAREDLIBV),)
- 	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
-+endif
- 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
- 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
- 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff --git a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
index 9fc5e81..252d436 100644
--- a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
+++ b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
@@ -1,42 +1,42 @@
---- configure.orig	2007-11-07 09:39:25.111922700 +0000
-+++ configure	2007-11-07 09:42:47.386922700 +0000
-@@ -260,18 +260,18 @@
-   TEST="all teststatic testshared"
- fi
+--- configure.orig	2012-05-02 05:17:08.000000000 +0100
++++ configure	2012-07-17 17:57:01.000000000 +0100
+@@ -381,18 +381,18 @@
+ echo >> configure.log
  
+ # check for large file support, and if none, check for fseeko()
 -cat > $test.c <<EOF
 -#include <sys/types.h>
 -off64_t dummy = 0;
 -EOF
--if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then
+-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
 -  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
 -  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
 -  ALL="${ALL} all64"
 -  TEST="${TEST} test64"
--  echo "Checking for off64_t... Yes."
--  echo "Checking for fseeko... Yes."
+-  echo "Checking for off64_t... Yes." | tee -a configure.log
+-  echo "Checking for fseeko... Yes." | tee -a configure.log
 -else
 +#cat > $test.c <<EOF
 +##include <sys/types.h>
 +#off64_t dummy = 0;
 +#EOF
-+#if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2>&1`" = ""; then
++#if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
 +#  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
 +#  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
 +#  ALL="${ALL} all64"
 +#  TEST="${TEST} test64"
-+#  echo "Checking for off64_t... Yes."
-+#  echo "Checking for fseeko... Yes."
++#  echo "Checking for off64_t... Yes." | tee -a configure.log
++#  echo "Checking for fseeko... Yes." | tee -a configure.log
 +#else
-   echo "Checking for off64_t... No."
+   echo "Checking for off64_t... No." | tee -a configure.log
+   echo >> configure.log
    cat > $test.c <<EOF
- #include <stdio.h>
-@@ -287,7 +287,7 @@
+@@ -409,7 +409,7 @@
      SFLAGS="${SFLAGS} -DNO_FSEEKO"
-     echo "Checking for fseeko... No."
+     echo "Checking for fseeko... No." | tee -a configure.log
    fi
 -fi
-+#fi
++##fi
  
- cp -p zconf.h.in zconf.h
+ echo >> configure.log
  
diff --git a/sdk/recipes/patches/zlib/zconf.h.in.p b/sdk/recipes/patches/zlib/zconf.h.in.p
deleted file mode 100644
index 772dad3..0000000
--- a/sdk/recipes/patches/zlib/zconf.h.in.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- zconf.h.in.old	2011-01-02 21:25:38.000000000 +0000
-+++ zconf.h.in	2011-01-02 21:26:07.000000000 +0000
-@@ -370,7 +370,7 @@
-  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
-  * equivalently requesting no 64-bit operations
-  */
--#if -_LARGEFILE64_SOURCE - -1 == 1
-+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
- #  undef _LARGEFILE64_SOURCE
- #endif
- 
diff --git a/sdk/recipes/patches/zlib/zlib.h.p b/sdk/recipes/patches/zlib/zlib.h.p
deleted file mode 100644
index 7fdd391..0000000
--- a/sdk/recipes/patches/zlib/zlib.h.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- zlib.h.orig	2009-03-27 01:06:27.000000000 +0000
-+++ zlib.h	2009-03-27 01:06:50.000000000 +0000
-@@ -1571,7 +1571,7 @@
-    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
- #endif
- 
--#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-+#if !defined(ZLIB_INTERNAL) && defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
- #  define gzopen gzopen64
- #  define gzseek gzseek64
- #  define gztell gztell64