From 46383ca6f41e7d69a7100f83faa7d75172f1766c Mon Sep 17 00:00:00 2001
From: John Mark Bell <jmb@netsurf-browser.org>
Date: Sun, 2 Jan 2011 21:32:48 +0000
Subject: Extra patches for zlib to avoid ugly warnings caused by the use of
 undefined preprocessor macros RISC OS-specific patch for zlib to stop it
 erroneously detecting largefile64 support where there is none Ensure we build
 zlib static and not shared

svn path=/toolchains/; revision=11182
---
 sdk/Makefile                                       |  5 ++-
 .../patches/zlib/arm-unknown-riscos/configure.p    | 42 ++++++++++++++++++++++
 sdk/recipes/patches/zlib/zconf.h.in.p              | 11 ++++++
 sdk/recipes/patches/zlib/zlib.h.p                  | 11 ++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
 create mode 100644 sdk/recipes/patches/zlib/zconf.h.in.p
 create mode 100644 sdk/recipes/patches/zlib/zlib.h.p

diff --git a/sdk/Makefile b/sdk/Makefile
index 3752e92..73a6cad 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -93,7 +93,10 @@ $(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d
 	mkdir -p $(BUILDDIR)/zlib
 	cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2
 	for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
-	cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV)
+ifneq ($(realpath $(RECIPES)/patches/zlib/$(TARGET)),)
+	for p in `ls $(RECIPES)/patches/zlib/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
+endif
+	cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --static
 	cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) make install
 	touch $@
 
diff --git a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
new file mode 100644
index 0000000..9fc5e81
--- /dev/null
+++ b/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
@@ -0,0 +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
+ 
+-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
+-  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."
+-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
++#  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."
++#else
+   echo "Checking for off64_t... No."
+   cat > $test.c <<EOF
+ #include <stdio.h>
+@@ -287,7 +287,7 @@
+     SFLAGS="${SFLAGS} -DNO_FSEEKO"
+     echo "Checking for fseeko... No."
+   fi
+-fi
++#fi
+ 
+ cp -p zconf.h.in zconf.h
+ 
diff --git a/sdk/recipes/patches/zlib/zconf.h.in.p b/sdk/recipes/patches/zlib/zconf.h.in.p
new file mode 100644
index 0000000..772dad3
--- /dev/null
+++ b/sdk/recipes/patches/zlib/zconf.h.in.p
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..7fdd391
--- /dev/null
+++ b/sdk/recipes/patches/zlib/zlib.h.p
@@ -0,0 +1,11 @@
+--- 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
-- 
cgit v1.2.3