diff options
author | adam <adam> | 2011-03-17 13:26:04 +0000 |
---|---|---|
committer | adam <adam> | 2011-03-17 13:26:04 +0000 |
commit | dfd5e91c3dc2430a9c645c87fe64e26455a6ae78 (patch) | |
tree | 4224eb59c52c56dd2511e98b9eb66546c893ad48 /databases/mysql51-server/patches | |
parent | 2b2e7f8ba2f85045e692ec3d3bde56df52963e05 (diff) | |
download | pkgsrc-dfd5e91c3dc2430a9c645c87fe64e26455a6ae78.tar.gz |
Fix building with Clang.
Diffstat (limited to 'databases/mysql51-server/patches')
-rw-r--r-- | databases/mysql51-server/patches/patch-ab | 13 | ||||
-rw-r--r-- | databases/mysql51-server/patches/patch-al | 22 |
2 files changed, 33 insertions, 2 deletions
diff --git a/databases/mysql51-server/patches/patch-ab b/databases/mysql51-server/patches/patch-ab index c39905112a2..030689d6efb 100644 --- a/databases/mysql51-server/patches/patch-ab +++ b/databases/mysql51-server/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:50 taca Exp $ +$NetBSD: patch-ab,v 1.4 2011/03/17 13:26:05 adam Exp $ ---- Makefile.in.orig 2010-11-29 10:42:58.000000000 +0000 +--- Makefile.in.orig 2011-02-11 19:24:28.000000000 +0000 +++ Makefile.in @@ -407,13 +407,10 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ @@ -20,3 +20,12 @@ $NetBSD: patch-ab,v 1.3 2010/12/16 03:42:50 taca Exp $ DIST_SUBDIRS = . include Docs zlib \ cmd-line-utils sql-common scripts \ +@@ -1145,7 +1142,7 @@ do_abi_check: + -e '/^#pragma GCC set_debug_pwd/d' \ + -e '/^#ident/d' > \ + $(top_builddir)/abi_check.out; \ +- @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ ++ @DIFF@ -I '#include' -w $$file.pp $(top_builddir)/abi_check.out; \ + @RM@ $(top_builddir)/abi_check.out; \ + done + diff --git a/databases/mysql51-server/patches/patch-al b/databases/mysql51-server/patches/patch-al new file mode 100644 index 00000000000..564264b4d68 --- /dev/null +++ b/databases/mysql51-server/patches/patch-al @@ -0,0 +1,22 @@ +$NetBSD: patch-al,v 1.3 2011/03/17 13:26:05 adam Exp $ + +Avoid C++ error (needed for Clang). + +--- work/mysql-5.1.56//storage/ndb/include/util/Parser.hpp.orig 2011-03-17 13:15:30.000000000 +0000 ++++ work/mysql-5.1.56//storage/ndb/include/util/Parser.hpp +@@ -148,12 +148,12 @@ public: + static const DummyRow* matchArg(Context*, const char *, const DummyRow *); + static bool parseArg(Context*, char*, const DummyRow*, Properties*); + static bool checkMandatory(Context*, const Properties*); +-private: +- const DummyRow * const m_rows; +- class ParseInputStream & input; + bool m_breakOnEmpty; + bool m_breakOnCmd; + bool m_breakOnInvalidArg; ++private: ++ const DummyRow * const m_rows; ++ class ParseInputStream & input; + }; + + template<class T> |