summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman <saurik@saurik.com>2008-08-22 09:13:56 +0000
committerJay Freeman <saurik@saurik.com>2008-08-22 09:13:56 +0000
commit8a51c0ce5a7d6e59962513c366b21fc8a658f458 (patch)
treef4b6290c85177a62a4c1a8980eb7c43edde1629e
parent77eebfabb1609ecfa3a916f4fa8cee04593d1a2a (diff)
Fixed BerkeleyDB mutex choice.
git-svn-id: http://svn.telesphoreo.org/trunk@450 514c082c-b64e-11dc-b46d-3d985efe055d
-rw-r--r--data/berkeleydb/case.diff31
-rw-r--r--data/berkeleydb/make.sh6
2 files changed, 35 insertions, 2 deletions
diff --git a/data/berkeleydb/case.diff b/data/berkeleydb/case.diff
new file mode 100644
index 000000000..2587fb6f5
--- /dev/null
+++ b/data/berkeleydb/case.diff
@@ -0,0 +1,31 @@
+diff -ru db-4.6.21/dist/aclocal/mutex.m4 db-4.6.21+iPhone/dist/aclocal/mutex.m4
+--- db-4.6.21/dist/aclocal/mutex.m4 2007-05-18 15:08:50.000000000 +0000
++++ db-4.6.21+iPhone/dist/aclocal/mutex.m4 2008-08-22 07:58:41.000000000 +0000
+@@ -534,21 +534,21 @@
+ # Configure a pthreads-style mutex implementation.
+ hybrid=pthread
+ case "$db_cv_mutex" in
+-POSIX/pthreads*) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+- AC_DEFINE(HAVE_MUTEX_PTHREADS)
+- AH_TEMPLATE(HAVE_MUTEX_PTHREADS,
+- [Define to 1 to use POSIX 1003.1 pthread_XXX mutexes.]);;
+ POSIX/pthreads/private*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ AC_DEFINE(HAVE_MUTEX_PTHREADS)
+ AC_DEFINE(HAVE_MUTEX_THREAD_ONLY)
+ AH_TEMPLATE(HAVE_MUTEX_THREAD_ONLY,
+ [Define to 1 to configure mutexes intra-process only.]);;
+-POSIX/pthreads/library*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+- AC_DEFINE(HAVE_MUTEX_PTHREADS);;
+ POSIX/pthreads/library/private*)
+ ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ AC_DEFINE(HAVE_MUTEX_PTHREADS)
+ AC_DEFINE(HAVE_MUTEX_THREAD_ONLY);;
++POSIX/pthreads/library*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
++ AC_DEFINE(HAVE_MUTEX_PTHREADS);;
++POSIX/pthreads*) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
++ AC_DEFINE(HAVE_MUTEX_PTHREADS)
++ AH_TEMPLATE(HAVE_MUTEX_PTHREADS,
++ [Define to 1 to use POSIX 1003.1 pthread_XXX mutexes.]);;
+ Solaris/lwp*) ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ AC_DEFINE(HAVE_MUTEX_SOLARIS_LWP)
+ AH_TEMPLATE(HAVE_MUTEX_SOLARIS_LWP,
diff --git a/data/berkeleydb/make.sh b/data/berkeleydb/make.sh
index 9a39a18fe..354b95c76 100644
--- a/data/berkeleydb/make.sh
+++ b/data/berkeleydb/make.sh
@@ -1,5 +1,7 @@
pkg:setup
-cd build_unix
-PKG_CONF=../dist/configure pkg:configure
+cd dist
+./s_config
+cd ../build_unix
+PKG_CONF=../dist/configure pkg:configure --with-mutex=Darwin/_spin_lock_try
make
pkg:install