diff options
| author | flo <flo@FreeBSD.org> | 2013-10-10 05:41:32 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-10-10 05:41:32 +0800 |
| commit | 8b82639d6a3f35473c92a5dd43c1fac741ea774d (patch) | |
| tree | 0a292a58364a96cc513dd41b6258fa1d59fa73b8 /databases | |
| parent | ac24c7fd553ae3422302d3939bd19ebcaeb9ed61 (diff) | |
| download | freebsd-ports-gnome-8b82639d6a3f35473c92a5dd43c1fac741ea774d.tar.gz freebsd-ports-gnome-8b82639d6a3f35473c92a5dd43c1fac741ea774d.tar.zst freebsd-ports-gnome-8b82639d6a3f35473c92a5dd43c1fac741ea774d.zip | |
- update to 5.6.13-rel61.0
- merge r329781 to fix build with clang on i386
Diffstat (limited to 'databases')
6 files changed, 90 insertions, 4 deletions
diff --git a/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp new file mode 100644 index 000000000000..ef8bb0670f75 --- /dev/null +++ b/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/include/misc.hpp.orig ++++ extra/yassl/taocrypt/include/misc.hpp +@@ -124,7 +124,7 @@ + + + // no gas on these systems ?, disable for now +-#if defined(__sun__) || defined (__APPLE__) ++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__) + #define TAOCRYPT_DISABLE_X86ASM + #endif + diff --git a/databases/percona56-client/files/patch-mysys__posix_timers.c b/databases/percona56-client/files/patch-mysys__posix_timers.c new file mode 100644 index 000000000000..52000de41a35 --- /dev/null +++ b/databases/percona56-client/files/patch-mysys__posix_timers.c @@ -0,0 +1,32 @@ +--- mysys/posix_timers.c.orig 2013-10-07 12:25:25.000000000 +0200 ++++ mysys/posix_timers.c 2013-10-07 21:04:37.090622581 +0200 +@@ -22,6 +22,10 @@ + #define sigev_notify_thread_id _sigev_un._tid + #endif + ++#ifdef __FreeBSD__ ++typedef union sigval sigval_t; ++#endif /* __FreeBSD__ */ ++ + #define MY_TIMER_EVENT_SIGNO (SIGRTMIN) + #define MY_TIMER_KILL_SIGNO (SIGRTMIN+1) + +@@ -68,7 +72,18 @@ + sigaddset(&set, MY_TIMER_KILL_SIGNO); + + /* Get the thread ID of the current thread. */ ++ ++#ifdef __FreeBSD__ ++# if __FreeBSD__version > 900030 ++ thread_id= pthread_getthreadid_np(); ++# else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ thread_id= (pid_t) tid; ++# endif ++#else + thread_id= (pid_t) syscall(SYS_gettid); ++#endif + + /* Wake up parent thread, thread_id is available. */ + pthread_barrier_wait(barrier); diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index c2bca091e0bd..4682b1ca1de0 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.13-rc60.6 +DISTVERSION= 5.6.13-rel61.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/ PKGNAMESUFFIX?= 56-server -DISTNAME= Percona-Server-5.6.13-rc60.6 +DISTNAME= Percona-Server-5.6.13-rel61.0 MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo index 02fc91641863..768d4294636c 100644 --- a/databases/percona56-server/distinfo +++ b/databases/percona56-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (Percona-Server-5.6.13-rc60.6.tar.gz) = 56f81458d7fcdaa619586be578e12a1b24aa54094f412fb9f8bd2004d1e8546e -SIZE (Percona-Server-5.6.13-rc60.6.tar.gz) = 33338612 +SHA256 (Percona-Server-5.6.13-rel61.0.tar.gz) = 6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8 +SIZE (Percona-Server-5.6.13-rel61.0.tar.gz) = 33401056 diff --git a/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp b/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp new file mode 100644 index 000000000000..ef8bb0670f75 --- /dev/null +++ b/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp @@ -0,0 +1,11 @@ +--- extra/yassl/taocrypt/include/misc.hpp.orig ++++ extra/yassl/taocrypt/include/misc.hpp +@@ -124,7 +124,7 @@ + + + // no gas on these systems ?, disable for now +-#if defined(__sun__) || defined (__APPLE__) ++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__) + #define TAOCRYPT_DISABLE_X86ASM + #endif + diff --git a/databases/percona56-server/files/patch-mysys__posix_timers.c b/databases/percona56-server/files/patch-mysys__posix_timers.c new file mode 100644 index 000000000000..52000de41a35 --- /dev/null +++ b/databases/percona56-server/files/patch-mysys__posix_timers.c @@ -0,0 +1,32 @@ +--- mysys/posix_timers.c.orig 2013-10-07 12:25:25.000000000 +0200 ++++ mysys/posix_timers.c 2013-10-07 21:04:37.090622581 +0200 +@@ -22,6 +22,10 @@ + #define sigev_notify_thread_id _sigev_un._tid + #endif + ++#ifdef __FreeBSD__ ++typedef union sigval sigval_t; ++#endif /* __FreeBSD__ */ ++ + #define MY_TIMER_EVENT_SIGNO (SIGRTMIN) + #define MY_TIMER_KILL_SIGNO (SIGRTMIN+1) + +@@ -68,7 +72,18 @@ + sigaddset(&set, MY_TIMER_KILL_SIGNO); + + /* Get the thread ID of the current thread. */ ++ ++#ifdef __FreeBSD__ ++# if __FreeBSD__version > 900030 ++ thread_id= pthread_getthreadid_np(); ++# else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ thread_id= (pid_t) tid; ++# endif ++#else + thread_id= (pid_t) syscall(SYS_gettid); ++#endif + + /* Wake up parent thread, thread_id is available. */ + pthread_barrier_wait(barrier); |