diff options
| author |   Markus Duft <mduft@gentoo.org> | 2010-01-15 08:16:21 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2010-01-15 08:16:21 +0000 |
| commit | 30945a47740528a209b05ca4d961f82358c93d00 (patch) | |
| tree | 8f23720e9fba6bb32889575ffb6b12b9de5107e8 /dev-db/sqlite/files | |
| parent | Add package.mask entry for www-client/chromium-4.0.295.0 dev channel release. (diff) | |
| download | gentoo-2-30945a47740528a209b05ca4d961f82358c93d00.tar.gz gentoo-2-30945a47740528a209b05ca4d961f82358c93d00.tar.bz2 gentoo-2-30945a47740528a209b05ca4d961f82358c93d00.zip | |
fixed interix patches
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-db/sqlite/files')
| -rw-r--r-- | dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch (renamed from dev-db/sqlite/files/sqlite-3.6.22-interix-utime-s.patch) | 12 | ||||
| -rw-r--r-- | dev-db/sqlite/files/sqlite-3.6.22-interix-fixes.patch | 22 | ||||
| -rw-r--r-- | dev-db/sqlite/files/sqlite-3.6.22-interix-no-estale.patch | 12 |
3 files changed, 34 insertions, 12 deletions
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 */ - |