summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-09-09 18:15:04 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-09-09 18:15:04 +0000
commit9172106a9a44cd95b6c99216129418aeff72281f (patch)
tree33d4c8c1294dc06353fd52e552f764925cfe2fbd /dev-db/sqlite/files
parentVersion bump (diff)
downloadgentoo-2-9172106a9a44cd95b6c99216129418aeff72281f.tar.gz
gentoo-2-9172106a9a44cd95b6c99216129418aeff72281f.tar.bz2
gentoo-2-9172106a9a44cd95b6c99216129418aeff72281f.zip
Disable static libraries. Remove libtool archives. Use eapi4 on 3 series ebuild. Remove overshadowed versions.
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-db/sqlite/files')
-rw-r--r--dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch11
-rw-r--r--dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch24
-rw-r--r--dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch63
-rw-r--r--dev-db/sqlite/files/sqlite-3.7.5-utimes.patch35
4 files changed, 0 insertions, 133 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch b/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch
deleted file mode 100644
index 01375bf85c57..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-dlopen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru sqlite-3.6.22/configure.ac sqlite-3.6.22.new/configure.ac
---- sqlite-3.6.22/configure.ac 2009-11-16 13:27:54.000000000 -0500
-+++ sqlite-3.6.22.new/configure.ac 2010-01-13 12:21:27.092738446 -0500
-@@ -637,6 +637,7 @@
- [use_loadextension=$enableval],[use_loadextension=no])
- if test "${use_loadextension}" = "yes" ; then
- OPT_FEATURE_FLAGS=""
-+ AC_SEARCH_LIBS(dlopen, dl)
- else
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
- fi
diff --git a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch b/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
deleted file mode 100644
index cc087a83d100..000000000000
--- a/dev-db/sqlite/files/sqlite-3.6.22-interix-fixes-amalgamation.patch
+++ /dev/null
@@ -1,24 +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:
-+#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
-@@ -23343,7 +23343,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.7.5-SQLITE_OMIT_WAL.patch b/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
deleted file mode 100644
index e49585643db8..000000000000
--- a/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://www.sqlite.org/src/ci/b9b48dd8dd
-
---- src/pager.c
-+++ src/pager.c
-@@ -2851,6 +2851,28 @@
- return rc;
- }
-
-+/*
-+** Update the value of the change-counter at offsets 24 and 92 in
-+** the header and the sqlite version number at offset 96.
-+**
-+** This is an unconditional update. See also the pager_incr_changecounter()
-+** routine which only updates the change-counter if the update is actually
-+** needed, as determined by the pPager->changeCountDone state variable.
-+*/
-+static void pager_write_changecounter(PgHdr *pPg){
-+ u32 change_counter;
-+
-+ /* Increment the value just read and write it back to byte 24. */
-+ change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
-+ put32bits(((char*)pPg->pData)+24, change_counter);
-+
-+ /* Also store the SQLite version number in bytes 96..99 and in
-+ ** bytes 92..95 store the change counter for which the version number
-+ ** is valid. */
-+ put32bits(((char*)pPg->pData)+92, change_counter);
-+ put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
-+}
-+
- #ifndef SQLITE_OMIT_WAL
- /*
- ** This function is invoked once for each page that has already been
-@@ -2921,29 +2943,6 @@
- return rc;
- }
-
--
--/*
--** Update the value of the change-counter at offsets 24 and 92 in
--** the header and the sqlite version number at offset 96.
--**
--** This is an unconditional update. See also the pager_incr_changecounter()
--** routine which only updates the change-counter if the update is actually
--** needed, as determined by the pPager->changeCountDone state variable.
--*/
--static void pager_write_changecounter(PgHdr *pPg){
-- u32 change_counter;
--
-- /* Increment the value just read and write it back to byte 24. */
-- change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
-- put32bits(((char*)pPg->pData)+24, change_counter);
--
-- /* Also store the SQLite version number in bytes 96..99 and in
-- ** bytes 92..95 store the change counter for which the version number
-- ** is valid. */
-- put32bits(((char*)pPg->pData)+92, change_counter);
-- put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
--}
--
- /*
- ** This function is a wrapper around sqlite3WalFrames(). As well as logging
- ** the contents of the list of pages headed by pList (connected by pDirty),
diff --git a/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch b/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch
deleted file mode 100644
index 4e8732926a2a..000000000000
--- a/dev-db/sqlite/files/sqlite-3.7.5-utimes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -127,7 +127,7 @@
- #########
- # Figure out whether or not we have these functions
- #
--AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r localtime_s])
-+AC_CHECK_FUNCS([usleep utimes fdatasync localtime_r gmtime_r localtime_s])
-
- #########
- # By default, we use the amalgamation (this may be changed below...)
---- src/os_unix.c
-+++ src/os_unix.c
-@@ -122,6 +122,9 @@
- #ifndef SQLITE_OMIT_WAL
- #include <sys/mman.h>
- #endif
-+#ifndef HAVE_UTIMES
-+#include <utime.h>
-+#endif
-
- #if SQLITE_ENABLE_LOCKING_STYLE
- # include <sys/ioctl.h>
-@@ -1610,7 +1613,11 @@
- pFile->eFileLock = eFileLock;
- #if !OS_VXWORKS
- /* Always update the timestamp on the old file */
-+#ifdef HAVE_UTIMES
- utimes(zLockFile, NULL);
-+#else
-+ utime(zLockFile, NULL);
-+#endif
- #endif
- return SQLITE_OK;
- }