diff options
author | spz <spz@pkgsrc.org> | 2018-10-29 18:48:14 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2018-10-29 18:48:14 +0000 |
commit | bf1b5faa47c7a97b6ed0983cc6941182f7b25ce6 (patch) | |
tree | 1b83c95b4d6ff2004e3a0276e0d386e0518b643f | |
parent | be16e061262fb9a36aff8a2ee9bdb009cf80d0e5 (diff) | |
download | pkgsrc-bf1b5faa47c7a97b6ed0983cc6941182f7b25ce6.tar.gz |
Pullup ticket #5858 - requested by taca
databases/mysql56-client: build fix
Revisions pulled up:
- databases/mysql56-client/distinfo 1.47
- databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h 1.1
- databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c 1.1
-------------------------------------------------------------------
Module Name: pkgsrc
Committed By: sevan
Date: Mon Oct 8 13:26:04 UTC 2018
Modified Files:
pkgsrc/databases/mysql56-client: distinfo
Added Files:
pkgsrc/databases/mysql56-client/patches:
patch-cmd-line-utils_libedit_chartype.h
patch-cmd-line-utils_libedit_vi.c
Log Message:
Unbreak build on DragonFly BSD.
Add OpenBSD to the exclusion list in chartype.h as with upstream version.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/mysql56-client/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h \
pkgsrc/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c
3 files changed, 43 insertions, 1 deletions
diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo index 96a9c2e795d..1c64806f509 100644 --- a/databases/mysql56-client/distinfo +++ b/databases/mysql56-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2018/02/05 16:09:52 jperkin Exp $ +$NetBSD: distinfo,v 1.46.6.1 2018/10/29 18:48:14 spz Exp $ SHA1 (mysql-5.6.39.tar.gz) = 8f69162cfcfb031e0e60f85e46182548a4e34b41 RMD160 (mysql-5.6.39.tar.gz) = 5b1eb6a5cd696112ec925b5d26dcf67dce7adc08 @@ -18,6 +18,8 @@ SHA1 (patch-cmake_os_SunOS.cmake) = 60ba9f81c28bbb78295b8a12fe6cd3b176c03f91 SHA1 (patch-cmake_plugin.cmake) = 03e7a7debd61e870bd76d5c5b253a620662b3595 SHA1 (patch-cmake_readline.cmake) = 6bec6ca87b45c739d0614493477a18bb7c56d981 SHA1 (patch-cmake_ssl.cmake) = a5a25b00010c6586e5a3e099975ddabe369d4247 +SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c +SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f SHA1 (patch-include_CMakeLists.txt) = 49d351a958e63c69ad8bfe5c50961fe3751e86c4 SHA1 (patch-include_my__global.h) = 843b9527faf880eee59cf02239ba601f5985ddfb SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 diff --git a/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h b/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h new file mode 100644 index 00000000000..d7df0c7d9e9 --- /dev/null +++ b/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_chartype.h @@ -0,0 +1,16 @@ +$NetBSD: patch-cmd-line-utils_libedit_chartype.h,v 1.1.2.2 2018/10/29 18:48:14 spz Exp $ + +Exclude DragonFly & OpenBSD + +--- cmd-line-utils/libedit/chartype.h.orig 2018-09-30 16:10:45.673504000 -0700 ++++ cmd-line-utils/libedit/chartype.h 2018-09-30 16:12:19.519385000 -0700 +@@ -49,7 +49,8 @@ + TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ + #if !defined(__NetBSD__) && !defined(__sun) \ + && !(defined(__APPLE__) && defined(__MACH__)) \ +- && !defined(__FreeBSD__) && !defined(_AIX) ++ && !defined(__FreeBSD__) && !defined(_AIX) \ ++ && !defined(__DragonFly__) && !defined(__OpenBSD__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c b/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c new file mode 100644 index 00000000000..4f702b2f07d --- /dev/null +++ b/databases/mysql56-client/patches/patch-cmd-line-utils_libedit_vi.c @@ -0,0 +1,24 @@ +$NetBSD: patch-cmd-line-utils_libedit_vi.c,v 1.1.2.2 2018/10/29 18:48:14 spz Exp $ + +DragonFly BSD build fix + +--- cmd-line-utils/libedit/vi.c.orig 2018-09-30 16:47:49.075991000 -0700 ++++ cmd-line-utils/libedit/vi.c 2018-09-30 16:48:41.343701000 -0700 +@@ -919,7 +919,7 @@ + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -928,7 +928,7 @@ + vi_alias(EditLine *el __attribute__((__unused__)), + Int c __attribute__((__unused__))) + { +-#if defined(__weak_reference) && !defined(__FreeBSD__) ++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__) + char alias_name[3]; + char *alias_text; + |