Date: Wed, 9 Oct 2013 21:41:32 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329931 - in head/databases: percona56-client/files percona56-server percona56-server/files Message-ID: <201310092141.r99LfWZo047764@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Oct 9 21:41:32 2013 New Revision: 329931 URL: http://svnweb.freebsd.org/changeset/ports/329931 Log: - update to 5.6.13-rel61.0 - merge r329781 to fix build with clang on i386 Added: head/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp (contents, props changed) head/databases/percona56-client/files/patch-mysys__posix_timers.c (contents, props changed) head/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp (contents, props changed) head/databases/percona56-server/files/patch-mysys__posix_timers.c (contents, props changed) Modified: head/databases/percona56-server/Makefile head/databases/percona56-server/distinfo Added: head/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp Wed Oct 9 21:41:32 2013 (r329931) @@ -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 + Added: head/databases/percona56-client/files/patch-mysys__posix_timers.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-client/files/patch-mysys__posix_timers.c Wed Oct 9 21:41:32 2013 (r329931) @@ -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); Modified: head/databases/percona56-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Wed Oct 9 21:15:37 2013 (r329930) +++ head/databases/percona56-server/Makefile Wed Oct 9 21:41:32 2013 (r329931) @@ -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) Modified: head/databases/percona56-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Wed Oct 9 21:15:37 2013 (r329930) +++ head/databases/percona56-server/distinfo Wed Oct 9 21:41:32 2013 (r329931) @@ -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 Added: head/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp Wed Oct 9 21:41:32 2013 (r329931) @@ -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 + Added: head/databases/percona56-server/files/patch-mysys__posix_timers.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona56-server/files/patch-mysys__posix_timers.c Wed Oct 9 21:41:32 2013 (r329931) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310092141.r99LfWZo047764>