diff options
| author | Bernhard Froehlich <decke@FreeBSD.org> | 2013-10-05 15:55:13 +0000 |
|---|---|---|
| committer | Bernhard Froehlich <decke@FreeBSD.org> | 2013-10-05 15:55:13 +0000 |
| commit | 9a1cf8046f334c83838aef00b23b4e38bce86409 (patch) | |
| tree | af1a1e4a22012916659eb688e1131891f58ae842 /databases/mysql56-server | |
| parent | 29da85dd1c4d2bf6a3780e09a79145153337a449 (diff) | |
| download | ports-9a1cf8046f334c83838aef00b23b4e38bce86409.tar.gz ports-9a1cf8046f334c83838aef00b23b4e38bce86409.zip | |
- Fix build problem on HEAD where libc++ bitset::test() and the
mysql built in macro test() from my_global.h clash.
The port requires another fix to properly compile on HEAD which
will be committed to libc++/include/memory on HEAD soon.
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=329470
Diffstat (limited to 'databases/mysql56-server')
| -rw-r--r-- | databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc new file mode 100644 index 000000000000..653f03095030 --- /dev/null +++ b/databases/mysql56-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> |