summaryrefslogtreecommitdiff
path: root/databases/mysql55-client
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2011-08-25 04:37:17 +0000
committeradam <adam@pkgsrc.org>2011-08-25 04:37:17 +0000
commitc8e54ccdfc2331fdfe0bdf659214cd2d7df9c13c (patch)
treec89acc4ce7043aa5c1dfcf756324dfc4ad414f01 /databases/mysql55-client
parent8bc3aee84242b9718901104db6d0d4300b7f23a2 (diff)
downloadpkgsrc-c8e54ccdfc2331fdfe0bdf659214cd2d7df9c13c.tar.gz
Fix for Mac OS X 10.7
Diffstat (limited to 'databases/mysql55-client')
-rw-r--r--databases/mysql55-client/distinfo3
-rw-r--r--databases/mysql55-client/patches/patch-mysys_my_init.c15
2 files changed, 17 insertions, 1 deletions
diff --git a/databases/mysql55-client/distinfo b/databases/mysql55-client/distinfo
index 3347bdfb084..d61726a8261 100644
--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/07/28 08:10:29 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/08/25 04:37:17 adam Exp $
SHA1 (mysql-5.5.15.tar.gz) = c89be9fe209d74b62a5e5e71e099dad1e0674a87
RMD160 (mysql-5.5.15.tar.gz) = 536bdcc576583b2ca5b937c1db237dab02453237
@@ -16,6 +16,7 @@ SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86
SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88
SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892
+SHA1 (patch-mysys_my_init.c) = 638f45648b3e62beac6c571d0847ec09da091d45
SHA1 (patch-mysys_stacktrace.c) = c7633ab86f02e345e95564536882e09a9ef19f8d
SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59
SHA1 (patch-scripts_mysqld_safe.sh) = 74879fe38b74e3a51db1dd1233b29a05e9edad28
diff --git a/databases/mysql55-client/patches/patch-mysys_my_init.c b/databases/mysql55-client/patches/patch-mysys_my_init.c
new file mode 100644
index 00000000000..2238e5a1d4f
--- /dev/null
+++ b/databases/mysql55-client/patches/patch-mysys_my_init.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-mysys_my_init.c,v 1.1 2011/08/25 04:37:18 adam Exp $
+
+Fix for Max OS X 10.7 where pthread_init() exists, but isn't a public interface.
+
+--- mysys/my_init.c.orig 2011-08-25 04:24:59.000000000 +0000
++++ mysys/my_init.c
+@@ -99,7 +99,7 @@ my_bool my_init(void)
+ fastmutex_global_init(); /* Must be called early */
+ #endif
+
+-#if defined(HAVE_PTHREAD_INIT)
++#if defined(HAVE_PTHREAD_INIT) && !defined(__APPLE__)
+ pthread_init(); /* Must be called before DBUG_ENTER */
+ #endif
+