diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-10-06 13:41:29 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-10-06 13:41:29 +0000 |
| commit | ec1f3e6529872f81a9800c2cbb792298df60db01 (patch) | |
| tree | cf8d4d7416ad3662c17f7889e06a104ab8654b98 /databases | |
| parent | - Update from 3.20.1 to 3.22.0 (diff) | |
- merge r329470 by decke from mysql56 (head build fix)
- merge r329549 by marino from mysql56 (use shebangfix)
Notes
Notes:
svn path=/head/; revision=329563
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/percona56-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index df78d62583c2..c2bca091e0bd 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -13,7 +13,7 @@ MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona56-client -USES= bison cmake +USES= bison cmake shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX OPTIONS_DEFAULT= OPENSSL @@ -40,6 +40,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 +SHEBANG_FILES= scripts/*.pl* scripts/*.sh + .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif diff --git a/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc new file mode 100644 index 000000000000..653f03095030 --- /dev/null +++ b/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc @@ -0,0 +1,11 @@ +--- plugin/password_validation/validate_password.cc.orig 2013-09-10 07:38:25.000000000 +0000 ++++ plugin/password_validation/validate_password.cc 2013-10-05 15:40:20.790380179 +0000 +@@ -16,6 +16,8 @@ + #include <my_sys.h> + #include <string> + #include <mysql/plugin_validate_password.h> ++/* solve clash between libc++ bitset::test() and test macro from my_global.h */ ++#undef test + #include <set> + #include <iostream> + #include <fstream> |