From 97d46648cdde5d8237d1241f3dc47fc455b35d33 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 22 Mar 2011 16:42:12 -0400
Subject: More SQLite work.

---
 bin/Mono.Data.Sqlite.dll.config | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 bin/Mono.Data.Sqlite.dll.config

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
new file mode 100644
index 0000000..456461e
--- /dev/null
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -0,0 +1,4 @@
+<configureation>
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_64.so" />
+</configuration>
-- 
cgit v1.1


From be878795aa67acb486113eb4d9cdf7154f4d8408 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 22 Mar 2011 17:36:01 -0400
Subject: Typo fix

---
 bin/Mono.Data.Sqlite.dll.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index 456461e..de0c17d 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,4 +1,4 @@
 <configureation>
   <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_32.so" />
 </configuration>
-- 
cgit v1.1


From 9c979dd0fc468ec5b15bb9b3db2eae55db53c0bc Mon Sep 17 00:00:00 2001
From: Marck
Date: Wed, 23 Mar 2011 08:35:39 +0100
Subject: Fix a typo in the SQLite DLL config and amend the instructions for
 running on Linux.

Under Linux (and probably also under OSX), the operating system must be able to find the new SQLite DLL in the library search path.
---
 bin/Mono.Data.Sqlite.dll.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index de0c17d..0c5e941 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,4 +1,4 @@
-<configureation>
+<configuration>
   <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="libsqlite3_64.so" />
   <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_32.so" />
 </configuration>
-- 
cgit v1.1


From fe6900b305392937bf22e54331c558cd667f9b63 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 27 Mar 2011 19:38:40 -0400
Subject: Touchup for SQLite

---
 bin/Mono.Data.Sqlite.dll.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index 0c5e941..b704035 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,4 +1,4 @@
 <configuration>
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
   <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_32.so" />
 </configuration>
-- 
cgit v1.1


From dd72a69ea54893b9d6d16f7d388e5fe12058fd9e Mon Sep 17 00:00:00 2001
From: Marck
Date: Mon, 28 Mar 2011 13:11:23 +0200
Subject: More touchup for SQLite.

Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary.
---
 bin/Mono.Data.Sqlite.dll.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index b704035..6a95476 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,4 +1,4 @@
 <configuration>
   <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="libsqlite3_32.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" />
 </configuration>
-- 
cgit v1.1


From 1b1e6f78fd61b1eb22ea140ba58cf7df3829fd20 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 7 Apr 2011 21:44:54 +0100
Subject: Bundle a built-from-source Mac OS X sqlite3 universal dylib with
 OpenSim and use this instead of the system one.

This means that Mac OS X users can now use the standard sqlite adaptor instead of the legacy one.
This is SQLite 3.7.5.  I configured the build with the line

CFLAGS="-Os -g -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc7400 -DSQLITE_ENABLE_COLUMN_METADATA" LDFLAGS="-arch i386 -arch x86_64 -arch ppc7400" ./configure --disable-dependency-tracking

The SQLITE_ENABLE_COLUMN_METADATA flag exports the metadata symbols that modern Mono SQLite adaptors need.
The -Os removes debugging symbols (as per the sqlite3 source pkg README)
The other parts are to cross compile for x86_64, i386 and ppc.  On Mac OS X, Mono can actually only P/INVOKE 32-bit libraries even on 64 bit platforms so i386 is being used.  The dylib has not been tested on ppc.
---
 bin/Mono.Data.Sqlite.dll.config | 1 +
 1 file changed, 1 insertion(+)

(limited to 'bin/Mono.Data.Sqlite.dll.config')

diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index 6a95476..ccc0cf5 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,4 +1,5 @@
 <configuration>
+  <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" />
   <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
   <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" />
 </configuration>
-- 
cgit v1.1