diff options
| author | Sukneet Basuta | 2012-05-29 09:42:34 -0400 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 12:26:01 +0400 |
| commit | b94ce60f9c21fc8e31dcf222b90bacc270c54b6e (patch) | |
| tree | 0576fc458a0afeadd1454f6589f630cd307b1df5 | |
| parent | 376345c818230241dcb414e2e85d4c794c594c56 (diff) | |
cyrus-sasl: added sqlite optional_depends
sqlite.patch: added, removes invalid gcc flags to allow compilation with sqlite support
(cherry picked from commit e610b3dcd6b2e460b7d159b51585e1a6fb50e599)
| -rwxr-xr-x | crypto/cyrus-sasl/DEPENDS | 7 | ||||
| -rw-r--r-- | crypto/cyrus-sasl/HISTORY | 5 | ||||
| -rwxr-xr-x | crypto/cyrus-sasl/PRE_BUILD | 1 | ||||
| -rw-r--r-- | crypto/cyrus-sasl/sqlite.patch | 26 |
4 files changed, 38 insertions, 1 deletions
diff --git a/crypto/cyrus-sasl/DEPENDS b/crypto/cyrus-sasl/DEPENDS index 470338cf76..60ea88e23a 100755 --- a/crypto/cyrus-sasl/DEPENDS +++ b/crypto/cyrus-sasl/DEPENDS @@ -35,10 +35,15 @@ if [[ "$CS_MECH" =~ 'auxprop' ]]; then gdbm) depends gdbm '--with-dblib=gdbm' ;; esac && + optional_depends sqlite \ + "--enable-sql --with-sqlite3=$INSTALL_ROOT/usr"\ + '--without-sqlite3' \ + 'auxprop SQLite backend' && + optional_depends sqlite2 \ "--enable-sql --with-sqlite=$INSTALL_ROOT/usr" \ '--without-sqlite' \ - 'auxprop SQLite backend' && + 'auxprop SQLite2 backend' && optional_depends MYSQL \ "--enable-sql --with-mysql=$INSTALL_ROOT/usr" \ diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY index 303d2bc9b4..2a66b60f4c 100644 --- a/crypto/cyrus-sasl/HISTORY +++ b/crypto/cyrus-sasl/HISTORY @@ -1,3 +1,8 @@ +2012-05-28 Sukneet Basuta <sukneet@sourcemage.org> + * DEPENDS: added sqlite optional_depends + * PRE_BUILD: patch to fix compilation with sqlite + * sqlite.patch: added, removes invalid gcc flags + 2012-01-19 Vlad Glagolev <stealth@sourcemage.org> * 6581B5F1.gpg: deleted, use the same key from section diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD index ba9528d40f..fc26314e83 100755 --- a/crypto/cyrus-sasl/PRE_BUILD +++ b/crypto/cyrus-sasl/PRE_BUILD @@ -1,4 +1,5 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && +patch -p0 < $SPELL_DIRECTORY/sqlite.patch patch -p1 < "$SPELL_DIRECTORY/db5.patch" diff --git a/crypto/cyrus-sasl/sqlite.patch b/crypto/cyrus-sasl/sqlite.patch new file mode 100644 index 0000000000..dd2715e929 --- /dev/null +++ b/crypto/cyrus-sasl/sqlite.patch @@ -0,0 +1,26 @@ +--- configure.b 2011-09-07 09:29:25.000000000 -0400 ++++ configure 2012-05-29 04:58:43.374173367 -0400 +@@ -14470,9 +14470,9 @@ + $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;; + *) + if test -d ${with_sqlite}/lib; then +- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" ++ LIB_SQLITE="-L${with_sqlite}/lib" + else +- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" ++ LIB_SQLITE="-L${with_sqlite}" + fi + + LIB_SQLITE_DIR=$LIB_SQLITE +@@ -14600,9 +14600,9 @@ + $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;; + *) + if test -d ${with_sqlite3}/lib; then +- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" ++ LIB_SQLITE3="-L${with_sqlite3}/lib" + else +- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" ++ LIB_SQLITE3="-L${with_sqlite3}" + fi + + LIB_SQLITE3_DIR=$LIB_SQLITE3 |