diff options
| author | adam <adam@pkgsrc.org> | 2011-03-17 13:26:04 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-03-17 13:26:04 +0000 |
| commit | d412fddae78c962678897753087bd5877f0e6fd8 (patch) | |
| tree | 4224eb59c52c56dd2511e98b9eb66546c893ad48 /databases/mysql51-client | |
| parent | 4fbd91bd63dae4f2aee8ae7f2f7f2caaf494432d (diff) | |
| download | pkgsrc-d412fddae78c962678897753087bd5877f0e6fd8.tar.gz | |
Fix building with Clang.
Diffstat (limited to 'databases/mysql51-client')
| -rw-r--r-- | databases/mysql51-client/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql51-client/options.mk | 14 | ||||
| -rw-r--r-- | databases/mysql51-client/patches/patch-ab | 12 |
3 files changed, 20 insertions, 10 deletions
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo index a078bb6c333..002692277d6 100644 --- a/databases/mysql51-client/distinfo +++ b/databases/mysql51-client/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2011/03/08 14:06:43 taca Exp $ +$NetBSD: distinfo,v 1.15 2011/03/17 13:26:04 adam Exp $ SHA1 (mysql-5.1.56.tar.gz) = 8665c76ab4ab36e8d2379ddf6d678c89b95d9321 RMD160 (mysql-5.1.56.tar.gz) = c2ff6eb06d0797d4b56630b783d4ad2d1add1422 Size (mysql-5.1.56.tar.gz) = 24795624 bytes SHA1 (patch-aa) = 344bc9ab7013fbf64be6adbe8a9fc6279887beb1 -SHA1 (patch-ab) = 66ea5217d98d33e1be44e4dda754a94496f1ea44 +SHA1 (patch-ab) = e61528fc6590deee16fcd7ad3eeeb96ed44a831d SHA1 (patch-ac) = a250b9797fbaad51d054cbb324feb0f7c29096d4 SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c SHA1 (patch-ae) = 5373aeea5d67d8d1cbee1fa4d04c03227b544e3d diff --git a/databases/mysql51-client/options.mk b/databases/mysql51-client/options.mk index ce56e194419..956aa1c5dea 100644 --- a/databases/mysql51-client/options.mk +++ b/databases/mysql51-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2010/03/21 14:40:15 taca Exp $ +# $NetBSD: options.mk,v 1.4 2011/03/17 13:26:04 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 @@ -12,16 +12,16 @@ PKG_SUGGESTED_OPTIONS+= embedded-server mysqlmanager ndb-cluster pstack ssl ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -. if ${OPSYS} == "SunOS" +. if ${OPSYS} == "SunOS" CHECK_BUILTIN.openssl:=yes -. include "../../security/openssl/builtin.mk" +. include "../../security/openssl/builtin.mk" CHECK_BUILTIN.openssl:=no -. if ${USE_BUILTIN.openssl} == "yes" +. if ${USE_BUILTIN.openssl} == "yes" CONFIGURE_ARGS+= --with-ssl=yes -. endif -. else +. endif +. else CONFIGURE_ARGS+= --with-ssl=yes -. endif +. endif .else CONFIGURE_ARGS+= --without-ssl .endif diff --git a/databases/mysql51-client/patches/patch-ab b/databases/mysql51-client/patches/patch-ab index 7697975baa5..f89a26565da 100644 --- a/databases/mysql51-client/patches/patch-ab +++ b/databases/mysql51-client/patches/patch-ab @@ -1,6 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2010/12/16 03:42:49 taca Exp $ +$NetBSD: patch-ab,v 1.4 2011/03/17 13:26:04 adam Exp $ * process directories in client package. +* Fix building with Clang (precompiler output doesn't print #include) --- Makefile.in.orig 2010-11-29 10:42:58.000000000 +0000 +++ Makefile.in @@ -20,3 +21,12 @@ $NetBSD: patch-ab,v 1.3 2010/12/16 03:42:49 taca Exp $ DIST_SUBDIRS = . include Docs zlib \ cmd-line-utils sql-common scripts \ +@@ -1145,7 +1140,7 @@ do_abi_check: + -e '/^#pragma GCC set_debug_pwd/d' \ + -e '/^#ident/d' > \ + $(top_builddir)/abi_check.out; \ +- @DIFF@ -I '#include' -w $$file.pp $(top_builddir)/abi_check.out; \ ++ @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ + @RM@ $(top_builddir)/abi_check.out; \ + done + |