4 files changed, 17 insertions, 51 deletions
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