Received: by mail.netbsd.org (Postfix, from userid 605) id C803784E5A; Sun, 8 Jan 2023 00:32:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 37EF284E5A for ; Sun, 8 Jan 2023 00:22:55 +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 UFewGZuV0-Xz for ; Sun, 8 Jan 2023 00:22:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7C4B984CBC for ; Sun, 8 Jan 2023 00:22:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7956DFA90; Sun, 8 Jan 2023 00:22:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673137374279350" MIME-Version: 1.0 Date: Sun, 8 Jan 2023 00:22:54 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/databases/mariadb106-client To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230108002254.7956DFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673137374279350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Jan 8 00:22:54 UTC 2023 Modified Files: pkgsrc/databases/mariadb106-client: Makefile distinfo Added Files: pkgsrc/databases/mariadb106-client/patches: patch-extra_readline_CMakeLists.txt Log Message: mariadb106-client: fix build on NetBSD with binutils 2.39 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mariadb106-client/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb106-client/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mariadb106-client/patches/patch-extra_readline_CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673137374279350 Content-Disposition: inline Content-Length: 2979 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb106-client/Makefile diff -u pkgsrc/databases/mariadb106-client/Makefile:1.10 pkgsrc/databases/mariadb106-client/Makefile:1.11 --- pkgsrc/databases/mariadb106-client/Makefile:1.10 Sun Nov 27 20:05:52 2022 +++ pkgsrc/databases/mariadb106-client/Makefile Sun Jan 8 00:22:54 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/11/27 20:05:52 nia Exp $ +# $NetBSD: Makefile,v 1.11 2023/01/08 00:22:54 wiz Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= MariaDB 10.6, a free MySQL compatible database (client) @@ -11,5 +11,7 @@ CMAKE_ARGS+= -DWITHOUT_SERVER=ON INSTALL_DIRS+= client include libmariadb man scripts +CMAKE_ARGS.NetBSD+= -DTGOTOLIB=-ltermcap + .include "options.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/databases/mariadb106-client/distinfo diff -u pkgsrc/databases/mariadb106-client/distinfo:1.12 pkgsrc/databases/mariadb106-client/distinfo:1.13 --- pkgsrc/databases/mariadb106-client/distinfo:1.12 Sun Nov 27 20:05:52 2022 +++ pkgsrc/databases/mariadb106-client/distinfo Sun Jan 8 00:22:54 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2022/11/27 20:05:52 nia Exp $ +$NetBSD: distinfo,v 1.13 2023/01/08 00:22:54 wiz Exp $ BLAKE2s (mariadb-10.6.11.tar.gz) = 35fdd56e98707990a65571f2dbc2c11739647d6075f700df0d6a707030c4d77d SHA512 (mariadb-10.6.11.tar.gz) = 4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98 @@ -7,6 +7,7 @@ SHA1 (patch-BUILD_compile-pentium32-gcov SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 SHA1 (patch-client_mysql.cc) = f49f942b765ccf427e9bcc9e4e0045ec74c94815 +SHA1 (patch-extra_readline_CMakeLists.txt) = 37873deaeccb37e1313179103bb12dcde4a496d6 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 SHA1 (patch-mysys_my__gethwaddr.c) = c3f179aa659e16f2fd9b858a718dd1cdd6f93c9f SHA1 (patch-plugin_auth__pam_testing_pam__mariadb__mtr.c) = 6062cfbb200af5b95ac05e4759f08b414f63db3d Added files: Index: pkgsrc/databases/mariadb106-client/patches/patch-extra_readline_CMakeLists.txt diff -u /dev/null pkgsrc/databases/mariadb106-client/patches/patch-extra_readline_CMakeLists.txt:1.1 --- /dev/null Sun Jan 8 00:22:54 2023 +++ pkgsrc/databases/mariadb106-client/patches/patch-extra_readline_CMakeLists.txt Sun Jan 8 00:22:54 2023 @@ -0,0 +1,12 @@ +$NetBSD: patch-extra_readline_CMakeLists.txt,v 1.1 2023/01/08 00:22:54 wiz Exp $ + +On NetBSD, tgoto is in libtermcap - helper patch. + +--- extra/readline/CMakeLists.txt.orig 2022-11-03 10:07:23.000000000 +0000 ++++ extra/readline/CMakeLists.txt +@@ -56,4 +56,4 @@ ADD_LIBRARY(readline STATIC + + # Declare dependency + # so every executable that links with readline links with curses as well +-TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY}) ++TARGET_LINK_LIBRARIES(readline ${CURSES_LIBRARY} ${TGOTOLIB}) --_----------=_1673137374279350--