diff options
Diffstat (limited to 'devel/apr2/files')
| -rw-r--r-- | devel/apr2/files/patch-apr-util_build_dbm.m4 | 21 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr-util_configure | 21 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr_dbd_sqlite3.c | 101 | ||||
| -rw-r--r-- | devel/apr2/files/patch-apr_hints.m4 | 15 |
4 files changed, 0 insertions, 158 deletions
diff --git a/devel/apr2/files/patch-apr-util_build_dbm.m4 b/devel/apr2/files/patch-apr-util_build_dbm.m4 deleted file mode 100644 index 68dd6cb2f837..000000000000 --- a/devel/apr2/files/patch-apr-util_build_dbm.m4 +++ /dev/null @@ -1,21 +0,0 @@ ---- apr-util-1.2.7/build/dbm.m4-orig Wed Dec 7 09:02:23 2005 -+++ apr-util-1.2.7/build/dbm.m4 Wed Dec 23 09:07:34 2005 -@@ -588,6 +588,8 @@ - elif test "$withval" = "no"; then - apu_have_gdbm=0 - else -+ saved_cppflags="$CPPFLAGS" -+ saved_libs="$LIBS" - CPPFLAGS="-I$withval/include" - LIBS="-L$withval/lib " - -@@ -597,6 +599,9 @@ - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) - APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) - fi -+ -+ CPPFLAGS="$saved_cppflags" -+ LIBS="$saved_libs" - fi - ], [ - apu_have_gdbm=0 diff --git a/devel/apr2/files/patch-apr-util_configure b/devel/apr2/files/patch-apr-util_configure deleted file mode 100644 index 9bfd536bc5aa..000000000000 --- a/devel/apr2/files/patch-apr-util_configure +++ /dev/null @@ -1,21 +0,0 @@ ---- apr-util-1.2.7/configure.orig Mon Sep 26 18:28:49 2005 -+++ apr-util-1.2.7/configure Fri Dec 23 15:06:09 2005 -@@ -13806,6 +13806,8 @@ - elif test "$withval" = "no"; then - apu_have_gdbm=0 - else -+ saved_cppflags="$CPPFLAGS" -+ saved_libs="$LIBS" - CPPFLAGS="-I$withval/include" - LIBS="-L$withval/lib " - -@@ -14064,6 +14066,9 @@ - fi - - fi -+ -+ CPPFLAGS="$saved_cppflags" -+ LIBS="$saved_libs" - fi - - else diff --git a/devel/apr2/files/patch-apr_dbd_sqlite3.c b/devel/apr2/files/patch-apr_dbd_sqlite3.c deleted file mode 100644 index bedbfb6c1474..000000000000 --- a/devel/apr2/files/patch-apr_dbd_sqlite3.c +++ /dev/null @@ -1,101 +0,0 @@ ---- apr-util-1.2.7/dbd/apr_dbd_sqlite3.c.orig Wed Mar 15 01:04:54 2006 -+++ apr-util-1.2.7/dbd/apr_dbd_sqlite3.c Mon May 29 09:08:08 2006 -@@ -24,6 +24,7 @@ - #include <sqlite3.h> - - #include "apr_strings.h" -+#include "apr_thread_mutex.h" - #include "apr_time.h" - - #include "apr_dbd_internal.h" -@@ -39,7 +40,9 @@ - struct apr_dbd_t { - sqlite3 *conn; - apr_dbd_transaction_t *trans; -+#if APR_HAS_THREADS - apr_thread_mutex_t *mutex; -+#endif - apr_pool_t *pool; - }; - -@@ -93,11 +96,15 @@ - return sql->trans->errnum; - } - -+#if APR_HAS_THREADS - apr_thread_mutex_lock(sql->mutex); -+#endif - - ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail); - if (!dbd_sqlite3_is_success(ret)) { -+#if APR_HAS_THREADS - apr_thread_mutex_unlock(sql->mutex); -+#endif - return ret; - } else { - int column_count; -@@ -118,7 +125,9 @@ - if (retry_count++ > MAX_RETRY_COUNT) { - ret = SQLITE_ERROR; - } else { -+#if APR_HAS_THREADS - apr_thread_mutex_unlock(sql->mutex); -+#endif - apr_sleep(MAX_RETRY_SLEEP); - apr_thread_mutex_lock(sql->mutex); - } -@@ -179,7 +188,9 @@ - } while (ret == SQLITE_ROW || ret == SQLITE_BUSY); - } - ret = sqlite3_finalize(stmt); -+#if APR_HAS_THREADS - apr_thread_mutex_unlock(sql->mutex); -+#endif - - if (sql->trans) { - sql->trans->errnum = ret; -@@ -242,7 +253,9 @@ - } - - length = strlen(query); -+#if APR_HAS_THREADS - apr_thread_mutex_lock(sql->mutex); -+#endif - - do { - ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail); -@@ -260,7 +273,9 @@ - if (dbd_sqlite3_is_success(ret)) { - ret = 0; - } -+#if APR_HAS_THREADS - apr_thread_mutex_unlock(sql->mutex); -+#endif - if (sql->trans) { - sql->trans->errnum = ret; - } -@@ -366,12 +381,14 @@ - sql->conn = conn; - sql->pool = pool; - sql->trans = NULL; -+#if APR_HAS_THREADS - /* Create a mutex */ - res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT, - pool); - if (res != APR_SUCCESS) { - return NULL; - } -+#endif - - return sql; - } -@@ -379,7 +396,9 @@ - static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle) - { - sqlite3_close(handle->conn); -+#if APR_HAS_THREADS - apr_thread_mutex_destroy(handle->mutex); -+#endif - return APR_SUCCESS; - } - diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4 deleted file mode 100644 index 3891ecae5176..000000000000 --- a/devel/apr2/files/patch-apr_hints.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- apr-1.2.7/build/apr_hints.m4.orig Wed Oct 27 11:12:28 2004 -+++ apr-1.2.7/build/apr_hints.m4 Wed Oct 27 11:25:32 2004 -@@ -137,11 +137,7 @@ - ;; - *-freebsd*) - APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE]) -- if test -x /sbin/sysctl; then -- os_version=`/sbin/sysctl -n kern.osreldate` -- else -- os_version=000000 -- fi -+ os_version="OSVERSION" - # 502102 is when libc_r switched to libpthread (aka libkse). - if test $os_version -ge "502102"; then - apr_cv_pthreads_cflags="none" |