aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authordecke <decke@FreeBSD.org>2013-10-05 23:55:13 +0800
committerdecke <decke@FreeBSD.org>2013-10-05 23:55:13 +0800
commit0a0c0ae751388011b29c93dfda8f912c0ba6c1ee (patch)
treeaf1a1e4a22012916659eb688e1131891f58ae842 /databases
parentc45f72e1f45d903e8bb3328cdffe25905d95c1af (diff)
downloadfreebsd-ports-gnome-0a0c0ae751388011b29c93dfda8f912c0ba6c1ee.tar.gz
freebsd-ports-gnome-0a0c0ae751388011b29c93dfda8f912c0ba6c1ee.tar.zst
freebsd-ports-gnome-0a0c0ae751388011b29c93dfda8f912c0ba6c1ee.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
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc11
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>