diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2012-03-30 20:57:49 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2012-03-31 21:33:04 -0400 |
| commit | 39da0be1d37cf88d346fdcd5b860564bb040ac34 (patch) | |
| tree | a3ce9dae885b53d2c09ce770fab7a58aaf76ca77 | |
| parent | 4b48974cb3e940c942fc3c524429f1a57b0010b2 (diff) | |
remove hurd patch until its shown that SQLCipher needs it
| -rw-r--r-- | debian/patches/20-hurd-locking-style.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch deleted file mode 100644 index 99d7779..0000000 --- a/debian/patches/20-hurd-locking-style.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/os_unix.c -+++ b/src/os_unix.c -@@ -124,7 +124,7 @@ - #endif - - --#if SQLITE_ENABLE_LOCKING_STYLE -+#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) - # include <sys/ioctl.h> - # if OS_VXWORKS - # include <semaphore.h> -@@ -2064,7 +2064,7 @@ - ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if - ** compiling for VXWORKS. - */ --#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS -+#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__) - - /* - ** Retry flock() calls that fail with EINTR -@@ -4360,7 +4360,7 @@ - dotlockCheckReservedLock /* xCheckReservedLock method */ - ) - --#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS -+#if (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) || defined(__GNU__) - IOMETHODS( - flockIoFinder, /* Finder function name */ - flockIoMethods, /* sqlite3_io_methods object name */ -@@ -6785,6 +6785,8 @@ - static sqlite3_vfs aVfs[] = { - #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) - UNIXVFS("unix", autolockIoFinder ), -+#elif defined(__GNU__) -+ UNIXVFS("unix", flockIoFinder ), - #else - UNIXVFS("unix", posixIoFinder ), - #endif diff --git a/debian/patches/series b/debian/patches/series index 7b65a7a..2ceb120 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 10-520466-libsqlite3-depends-on-libdl.patch 10-520478-squash-bad-deps.patch -20-hurd-locking-style.patch |