Skip to content

Instantly share code, notes, and snippets.

@gergoerdosi
Created May 9, 2012 11:44
Show Gist options
  • Save gergoerdosi/2643934 to your computer and use it in GitHub Desktop.
Save gergoerdosi/2643934 to your computer and use it in GitHub Desktop.
Percona Server - Update to version 5.5.22-25.2
diff --git a/Library/Formula/percona-server.rb b/Library/Formula/percona-server.rb
index d6c2f54..365e2b5 100644
--- a/Library/Formula/percona-server.rb
+++ b/Library/Formula/percona-server.rb
@@ -1,10 +1,10 @@
require 'formula'
class PerconaServer < Formula
- url 'http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.15-21.0/source/Percona-Server-5.5.15-rel21.0.tar.gz'
+ url 'http://www.percona.com/redir/downloads/Percona-Server-5.5/Percona-Server-5.5.22-25.2/source/Percona-Server-5.5.22-rel25.2.tar.gz'
homepage 'http://www.percona.com'
- md5 'd04b6d1cc863f121f5d1eac8bc618331'
- version '5.5.15-21.0'
+ md5 '2fc67b0e0e31c1a7949beae9399abc33'
+ version '5.5.22-25.2'
keg_only "This brew conflicts with 'mysql'. It's safe to `brew link` if you haven't installed 'mysql'"
@@ -49,7 +49,8 @@ class PerconaServer < Formula
"-DWITH_SSL=yes",
"-DDEFAULT_CHARSET=utf8",
"-DDEFAULT_COLLATION=utf8_general_ci",
- "-DSYSCONFDIR=#{etc}"
+ "-DSYSCONFDIR=#{etc}",
+ "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
]
# To enable unit testing at build, we need to download the unit testing suite
@@ -184,19 +185,17 @@ index efc8254..8964b70 100644
# The first option we might strip will always have a space before it because
# we set -I$pkgincludedir as the first option
diff --git a/configure.cmake b/configure.cmake
-index 0014c1d..21fe471 100644
+index c3cc787..6193481 100644
--- a/configure.cmake
+++ b/configure.cmake
-@@ -391,7 +391,11 @@ CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
- CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
- CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
- CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
--CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT)
-+
-+IF (NOT CMAKE_OSX_SYSROOT)
-+ CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT)
-+ENDIF (NOT CMAKE_OSX_SYSROOT)
-+
- CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
- CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
- CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
+@@ -149,7 +149,9 @@ IF(UNIX)
+ SET(CMAKE_REQUIRED_LIBRARIES
+ ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+
+- LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++ IF(CMAKE_REQUIRED_LIBRARIES)
++ LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
++ ENDIF()
+ LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT})
+
+ OPTION(WITH_LIBWRAP "Compile with tcp wrappers support" OFF)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment