diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2015-02-12 22:38:18 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2015-02-12 22:38:18 +0000 |
| commit | 86aa476560755c92410a6f61f4aaff7a87af8c25 (patch) | |
| tree | 03fd8292631b8e0761de146e07e0990d195b477f /databases/percona56-client | |
| parent | 48416370ea318dedb9f0ffc1a096240e6354d1e7 (diff) | |
| download | ports-86aa476560755c92410a6f61f4aaff7a87af8c25.tar.gz ports-86aa476560755c92410a6f61f4aaff7a87af8c25.zip | |
Update to 5.6.22-72.0
Fix build on arm [1]
PR: 197550 [1]
Submitted by: mikael.urankar@gmail.com [1]
Tested by: sbruno [1]
Notes
Notes:
svn path=/head/; revision=378901
Diffstat (limited to 'databases/percona56-client')
| -rw-r--r-- | databases/percona56-client/files/patch-scripts_CMakeLists.txt | 24 | ||||
| -rw-r--r-- | databases/percona56-client/pkg-plist | 1 |
2 files changed, 13 insertions, 12 deletions
diff --git a/databases/percona56-client/files/patch-scripts_CMakeLists.txt b/databases/percona56-client/files/patch-scripts_CMakeLists.txt index 0235dc2f305f..34c0ce2ac758 100644 --- a/databases/percona56-client/files/patch-scripts_CMakeLists.txt +++ b/databases/percona56-client/files/patch-scripts_CMakeLists.txt @@ -1,5 +1,5 @@ ---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100 +--- scripts/CMakeLists.txt.orig 2015-02-05 14:28:58.000000000 +0100 ++++ scripts/CMakeLists.txt 2015-02-12 23:27:08.364991000 +0100 @@ -71,6 +71,7 @@ ) ENDIF() @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -139,6 +141,7 @@ +@@ -143,6 +145,7 @@ SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -175,6 +178,7 @@ +@@ -179,6 +182,7 @@ DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -199,6 +203,7 @@ +@@ -203,6 +207,7 @@ SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,15 +40,15 @@ IF(UNIX) SET(EXT) ELSE() -@@ -213,6 +218,7 @@ +@@ -217,6 +222,7 @@ DESTINATION ${DEST} COMPONENT Server ) +ENDIF() - SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -264,6 +270,8 @@ + SET(sysconfdir ${prefix}) +@@ -273,6 +279,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -57,7 +57,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -316,17 +324,9 @@ +@@ -328,17 +336,9 @@ SET(BIN_SCRIPTS msql2mysql mysql_config @@ -72,10 +72,10 @@ - mysqldumpslow - mysqld_multi - mysqld_safe + ps_tokudb_admin ) FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) -@@ -350,6 +350,7 @@ +@@ -363,6 +363,7 @@ ) ENDFOREACH() @@ -83,7 +83,7 @@ # Input files with pl.in extension - drop the extension completely SET(PLIN_FILES mysql_secure_installation) FOREACH(file ${PLIN_FILES}) -@@ -362,6 +363,7 @@ +@@ -375,6 +376,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) ENDFOREACH() ENDIF() diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist index 2afb7351d62e..b65c2a2bbb7e 100644 --- a/databases/percona56-client/pkg-plist +++ b/databases/percona56-client/pkg-plist @@ -13,6 +13,7 @@ bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap +bin/ps_tokudb_admin include/mysql/big_endian.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h |