Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id E2A3E7A25E for ; Tue, 27 Sep 2016 09:02:00 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8893E85EE1; Tue, 27 Sep 2016 09:02:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1736B85EE0 for ; Tue, 27 Sep 2016 09:02:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 4qtfsZmyqMrh for ; Tue, 27 Sep 2016 09:01:59 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 931AD85EDE for ; Tue, 27 Sep 2016 09:01:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 88F3EFBD2; Tue, 27 Sep 2016 09:01:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474966919253750" MIME-Version: 1.0 Date: Tue, 27 Sep 2016 09:01:59 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/databases/mysql57-client To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20160927090159.88F3EFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1474966919253750 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Tue Sep 27 09:01:59 UTC 2016 Modified Files: pkgsrc/databases/mysql57-client: distinfo Added Files: pkgsrc/databases/mysql57-client/patches: patch-include_my__thread__os__id.h Log Message: Add thread ID support on NetBSD. Fixes build. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/mysql57-client/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mysql57-client/patches/patch-include_my__thread__os__id.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1474966919253750 Content-Disposition: inline Content-Length: 2625 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mysql57-client/distinfo diff -u pkgsrc/databases/mysql57-client/distinfo:1.1 pkgsrc/databases/mysql57-client/distinfo:1.2 --- pkgsrc/databases/mysql57-client/distinfo:1.1 Fri Sep 16 06:49:11 2016 +++ pkgsrc/databases/mysql57-client/distinfo Tue Sep 27 09:01:59 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2016/09/16 06:49:11 adam Exp $ +$NetBSD: distinfo,v 1.2 2016/09/27 09:01:59 fhajny Exp $ SHA1 (mysql-5.7.15.tar.gz) = ea4f79fea576f373560ec88b42121b4522be3d58 RMD160 (mysql-5.7.15.tar.gz) = 02a01866339764018ae40f0109dbf1e2fafb8ab3 @@ -16,6 +16,7 @@ SHA1 (patch-include_CMakeLists.txt) = 94 SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2 SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127 +SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb SHA1 (patch-libmysql_CMakeLists.txt) = 0105627fb9a5be56eaf21cda927589e0ffd99758 SHA1 (patch-mysql-test_CMakeLists.txt) = 4ba56ce255f5f89d9aece93181e54ddb572f301b SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c Added files: Index: pkgsrc/databases/mysql57-client/patches/patch-include_my__thread__os__id.h diff -u /dev/null pkgsrc/databases/mysql57-client/patches/patch-include_my__thread__os__id.h:1.1 --- /dev/null Tue Sep 27 09:01:59 2016 +++ pkgsrc/databases/mysql57-client/patches/patch-include_my__thread__os__id.h Tue Sep 27 09:01:59 2016 @@ -0,0 +1,35 @@ +$NetBSD: patch-include_my__thread__os__id.h,v 1.1 2016/09/27 09:01:59 fhajny Exp $ + +Add support for NetBSD. + +--- include/my_thread_os_id.h.orig 2016-08-25 11:52:06.000000000 +0000 ++++ include/my_thread_os_id.h +@@ -30,6 +30,10 @@ + #include /* pthread_self */ + #endif + ++#ifdef __NetBSD__ ++#include ++#endif ++ + #ifdef HAVE_PTHREAD_GETTHREADID_NP + #include /* pthread_getthreadid_np() */ + #endif /* HAVE_PTHREAD_GETTHREADID_NP */ +@@ -74,6 +78,9 @@ static inline my_thread_os_id_t my_threa + /* FreeBSD 10.2 */ + return pthread_getthreadid_np(); + #else ++#ifdef __NetBSD__ ++ return (int)_lwp_self(); ++#else + #ifdef HAVE_INTEGER_PTHREAD_SELF + /* Unknown platform, fallback. */ + return pthread_self(); +@@ -81,6 +88,7 @@ static inline my_thread_os_id_t my_threa + /* Feature not available. */ + return 0; + #endif /* HAVE_INTEGER_PTHREAD_SELF */ ++#endif /* __NetBSD__ */ + #endif /* HAVE_PTHREAD_GETTHREADID_NP */ + #endif /* _WIN32 */ + #endif /* HAVE_SYS_GETTID */ --_----------=_1474966919253750--