fixed interix patches

(Portage version: 2.1.6.13/cvs/Linux i686)

5 files changed, 49 insertions, 16 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 757f38944d79..03858da51554 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.319 2010/01/14 23:14:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.320 2010/01/15 08:16:21 mduft Exp $
+
+  15 Jan 2010; Markus Duft <mduft@gentoo.org> sqlite-3.6.22.ebuild,
+  +files/sqlite-3.6.22-interix-fixes.patch,
+  +files/sqlite-3.6.22-interix-fixes-amalgamation.patch,
+  -files/sqlite-3.6.22-interix-no-estale.patch,
+  -files/sqlite-3.6.22-interix-utime-s.patch:
+  fixed interix patches for non-amalgamation builds - completely missed
+  those before.
 
   14 Jan 2010; Jeremy Olexa <darkside@gentoo.org> sqlite-3.6.22.ebuild:
   Disable interix patches until bug 300940 is resolved. Sorry.
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-utime-s.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
index 2018c935ee69..cc087a83d100 100644
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-utime-s.patch
+++ b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
@@ -1,3 +1,15 @@
+--- sqlite-3.6.22.orig/sqlite3.c	2010-01-13 22:28:39 -0800
++++ sqlite-3.6.22/sqlite3.c	2010-01-13 22:36:25 -0800
+@@ -21915,7 +21915,9 @@
+   case ENODEV:
+   case ENXIO:
+   case ENOENT:
++#ifdef ESTALE
+   case ESTALE:
++#endif
+   case ENOSYS:
+     /* these should force the client to close the file and reconnect */
+     
 diff -ru sqlite-3.6.22.orig/sqlite3.c sqlite-3.6.22/sqlite3.c
 --- sqlite-3.6.22.orig/sqlite3.c	2010-01-14 15:20:11 +0100
 +++ sqlite-3.6.22/sqlite3.c	2010-01-14 15:21:25 +0100
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch
new file mode 100644
index 000000000000..dae98fd653a0
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch
@@ -0,0 +1,22 @@
+diff -ru sqlite-3.6.22.orig/src/os_unix.c sqlite-3.6.22/src/os_unix.c
+--- sqlite-3.6.22.orig/src/os_unix.c	2010-01-15 09:00:06 +0100
++++ sqlite-3.6.22/src/os_unix.c	2010-01-15 09:01:42 +0100
+@@ -436,7 +436,9 @@
+   case ENODEV:
+   case ENXIO:
+   case ENOENT:
++#ifdef ESTALE
+   case ESTALE:
++#endif
+   case ENOSYS:
+     /* these should force the client to close the file and reconnect */
+     
+@@ -1862,7 +1864,7 @@
+     pFile->locktype = locktype;
+ #if !OS_VXWORKS
+     /* Always update the timestamp on the old file */
+-    utimes(zLockFile, NULL);
++    utime(zLockFile, NULL);
+ #endif
+     return SQLITE_OK;
+   }
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch
deleted file mode 100644
index 79b06387d245..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sqlite-3.6.22.orig/sqlite3.c	2010-01-13 22:28:39 -0800
-+++ sqlite-3.6.22/sqlite3.c	2010-01-13 22:36:25 -0800
-@@ -21915,7 +21915,9 @@
-   case ENODEV:
-   case ENXIO:
-   case ENOENT:
-+#ifndef __INTERIX
-   case ESTALE:
-+#endif
-   case ENOSYS:
-     /* these should force the client to close the file and reconnect */
-     
diff --git a/dev-db/sqlite/sqlite-3.6.22.ebuild b/dev-db/sqlite/sqlite-3.6.22.ebuild
index 45fb2d0a689e..f4449b132612 100644
--- a/dev-db/sqlite/sqlite-3.6.22.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.8 2010/01/14 23:14:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.9 2010/01/15 08:16:21 mduft Exp $
 
 EAPI="2"
 
@@ -36,8 +36,11 @@ src_prepare() {
 		rm -f test/like.test
 	fi
 
-#	epatch "${FILESDIR}"/${P}-interix-no-estale.patch
-#	epatch "${FILESDIR}"/${P}-interix-utime-s.patch
+	if use tcl || use test; then
+		epatch "${FILESDIR}"/${P}-interix-fixes.patch
+	else
+		epatch "${FILESDIR}"/${P}-interix-fixes-amalgamation.patch
+	fi
 
 	epunt_cxx
 	elibtoolize # for MiNT