Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 638F51A921F for ; Wed, 6 Apr 2022 18:04:53 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id AE1FE84F91; Wed, 6 Apr 2022 18:04:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E9DDD84D8A for ; Wed, 6 Apr 2022 18:04:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id aIY-2LK724rB for ; Wed, 6 Apr 2022 18:04:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5C79E84D24 for ; Wed, 6 Apr 2022 18:04:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5603BFB24; Wed, 6 Apr 2022 18:04:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164926829169560" MIME-Version: 1.0 Date: Wed, 6 Apr 2022 18:04:51 +0000 From: "Brook Milligan" Subject: CVS commit: pkgsrc/databases/mariadb106-client To: pkgsrc-changes@NetBSD.org Reply-To: brook@netbsd.org X-Mailer: log_accum Message-Id: <20220406180451.5603BFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164926829169560 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: brook Date: Wed Apr 6 18:04:51 UTC 2022 Modified Files: pkgsrc/databases/mariadb106-client: distinfo Added Files: pkgsrc/databases/mariadb106-client/patches: patch-client_mysql.cc Log Message: mariadb106-client: no need to special case __APPLE__ for pkgsrc builds The file client/mysql.cc uses the readline library, but it has preprocessor conditionals specially for __APPLE__. Pkgsrc expects a common readline, however, and so the build fails. Removing the special case handles __APPLE__ the same as other platforms. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb106-client/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mariadb106-client/patches/patch-client_mysql.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164926829169560 Content-Disposition: inline Content-Length: 2307 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb106-client/distinfo diff -u pkgsrc/databases/mariadb106-client/distinfo:1.6 pkgsrc/databases/mariadb106-client/distinfo:1.7 --- pkgsrc/databases/mariadb106-client/distinfo:1.6 Sat Feb 19 09:13:21 2022 +++ pkgsrc/databases/mariadb106-client/distinfo Wed Apr 6 18:04:51 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2022/02/19 09:13:21 nia Exp $ +$NetBSD: distinfo,v 1.7 2022/04/06 18:04:51 brook Exp $ BLAKE2s (mariadb-10.6.7.tar.gz) = 5d4b482e6e06b337ff8180a2fe8b94b8e9f1cc1cea6b7dfe89eaa05c56eab701 SHA512 (mariadb-10.6.7.tar.gz) = 2d26f56ea5f39b800a6f279c8411d4091b4f4d3acbf3ea1864068328d34a1437e7c46c08d3772009357fd89602e58f214266038e177c0a4fac914a5e5d01e3e6 @@ -6,6 +6,7 @@ Size (mariadb-10.6.7.tar.gz) = 85882896 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f SHA1 (patch-CMakeLists.txt) = ea2f334ff1743e1676fe73e9946d0759c68e1d31 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 +SHA1 (patch-client_mysql.cc) = f49f942b765ccf427e9bcc9e4e0045ec74c94815 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51 Added files: Index: pkgsrc/databases/mariadb106-client/patches/patch-client_mysql.cc diff -u /dev/null pkgsrc/databases/mariadb106-client/patches/patch-client_mysql.cc:1.1 --- /dev/null Wed Apr 6 18:04:51 2022 +++ pkgsrc/databases/mariadb106-client/patches/patch-client_mysql.cc Wed Apr 6 18:04:51 2022 @@ -0,0 +1,25 @@ +$NetBSD: patch-client_mysql.cc,v 1.1 2022/04/06 18:04:51 brook Exp $ + +Do not special case __APPLE__ for pkgsrc builds. + +--- client/mysql.cc.orig 2022-02-10 20:17:07.000000000 +0000 ++++ client/mysql.cc +@@ -91,14 +91,10 @@ extern "C" { + #if defined(_WIN32) + #include + #else +-# ifdef __APPLE__ +-# include +-# else +-# include +-# if !defined(USE_LIBEDIT_INTERFACE) +-# include +-# endif +-# endif ++#include ++#if !defined(USE_LIBEDIT_INTERFACE) ++# include ++#endif + #define HAVE_READLINE + #endif + #define USE_POPEN --_----------=_164926829169560--