pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/mysql57-client Unbreak build on DragonFly BSD.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42c0d82cdc07
branches:  trunk
changeset: 313478:42c0d82cdc07
user:      sevan <sevan%pkgsrc.org@localhost>
date:      Mon Oct 01 00:11:29 2018 +0000

description:
Unbreak build on DragonFly BSD.
Add OpenBSD to the exclusion list in chartype.h as with upstream version.

diffstat:

 databases/mysql57-client/distinfo                                        |   4 +-
 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h |  16 ++++++
 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c       |  24 ++++++++++
 3 files changed, 43 insertions(+), 1 deletions(-)

diffs (66 lines):

diff -r 78053baf28ee -r 42c0d82cdc07 databases/mysql57-client/distinfo
--- a/databases/mysql57-client/distinfo Sun Sep 30 23:47:44 2018 +0000
+++ b/databases/mysql57-client/distinfo Mon Oct 01 00:11:29 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2018/08/16 16:06:09 adam Exp $
+$NetBSD: distinfo,v 1.23 2018/10/01 00:11:29 sevan Exp $
 
 SHA1 (mysql-5.7.23.tar.gz) = 0c07dd1670f3749c482180227717738c031bb5b4
 RMD160 (mysql-5.7.23.tar.gz) = 20021aa73537f4630b72931925bec78c251b06e6
@@ -12,6 +12,8 @@
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
+SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
+SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
 SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
diff -r 78053baf28ee -r 42c0d82cdc07 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_chartype.h  Mon Oct 01 00:11:29 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmd-line-utils_libedit_chartype.h,v 1.1 2018/10/01 00:11:29 sevan 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 -r 78053baf28ee -r 42c0d82cdc07 databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql57-client/patches/patch-cmd-line-utils_libedit_vi.c        Mon Oct 01 00:11:29 2018 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmd-line-utils_libedit_vi.c,v 1.1 2018/10/01 00:11:29 sevan 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;
+ 



Home | Main Index | Thread Index | Old Index