From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D0EC2158042 for ; Wed, 6 Nov 2024 11:03:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25B36E094B; Wed, 6 Nov 2024 11:03:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FCE4E094B for ; Wed, 6 Nov 2024 11:03:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 477923409C8 for ; Wed, 6 Nov 2024 11:03:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A838EF32 for ; Wed, 6 Nov 2024 11:03:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1730890985.b596033c1094a9f3403dddb25174a0579bdbe99f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch dev-db/sqlite/sqlite-3.47.0.ebuild X-VCS-Directories: dev-db/sqlite/files/ dev-db/sqlite/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b596033c1094a9f3403dddb25174a0579bdbe99f X-VCS-Branch: master Date: Wed, 6 Nov 2024 11:03:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1a010e7-47a0-4508-9b5a-f03960754304 X-Archives-Hash: fe89a1cac2314720db005e8b6b60b15a commit: b596033c1094a9f3403dddb25174a0579bdbe99f Author: Sam James gentoo org> AuthorDate: Wed Nov 6 11:03:05 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 6 11:03:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b596033c dev-db/sqlite: fix build w/ non-bash Bug: https://bugs.gentoo.org/942918 Closes: https://bugs.gentoo.org/942917 Signed-off-by: Sam James gentoo.org> dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch | 53 +++++++++++++++++++++++++ dev-db/sqlite/sqlite-3.47.0.ebuild | 1 + 2 files changed, 54 insertions(+) diff --git a/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch b/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch new file mode 100644 index 000000000000..3eece5ed5b29 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch @@ -0,0 +1,53 @@ +https://sqlite.org/forum/info/14274389fb2 +https://bugs.gentoo.org/942917 +https://bugs.gentoo.org/942918 +https://github.com/sqlite/sqlite/commit/a40e6e927313ed97a895ff7c022eff705e50b1e6 + +From a40e6e927313ed97a895ff7c022eff705e50b1e6 Mon Sep 17 00:00:00 2001 +From: stephan +Date: Wed, 30 Oct 2024 00:35:08 +0000 +Subject: [PATCH] Replace 3 instances of the == 'test' shell command operator + with =, as == is apparently not as portable across shells. Problem reported + in [forum:14274389fb2|forum post 14274389fb2]. + +FossilOrigin-Name: 68199c40fedeb07a3f9c5024fac6376a0579a13b0e5690aef6238e3e22b9c1b7 +--- a/configure ++++ b/configure +@@ -10334,7 +10334,7 @@ else + fi + + original_use_tcl=${use_tcl} +-if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then ++if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then + for ac_prog in tclsh9.0 tclsh8.6 tclsh + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -10453,7 +10453,7 @@ $as_echo "unable to run tests because no tclConfig.sh file could be located" >&6 + HAVE_TCL=0 + fi + +-if test x"$TCLSH_CMD" == x; then ++if test x"$TCLSH_CMD" = x; then + TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION} + if test ! -x ${TCLSH_CMD}; then + TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh +--- a/configure.ac ++++ b/configure.ac +@@ -124,7 +124,7 @@ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfi + AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory programs that require TCL-dev]), + [use_tcl=$enableval],[use_tcl=yes]) + original_use_tcl=${use_tcl} +-if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then ++if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then + AC_CHECK_PROGS(TCLSH_CMD, [tclsh9.0 tclsh8.6 tclsh],none) + with_tclsh=${TCLSH_CMD} + fi +@@ -195,7 +195,7 @@ else + HAVE_TCL=0 + fi + AC_SUBST(HAVE_TCL) +-if test x"$TCLSH_CMD" == x; then ++if test x"$TCLSH_CMD" = x; then + TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION} + if test ! -x ${TCLSH_CMD}; then + TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh diff --git a/dev-db/sqlite/sqlite-3.47.0.ebuild b/dev-db/sqlite/sqlite-3.47.0.ebuild index 6f71237f381c..f2269f2a942c 100644 --- a/dev-db/sqlite/sqlite-3.47.0.ebuild +++ b/dev-db/sqlite/sqlite-3.47.0.ebuild @@ -52,6 +52,7 @@ fi PATCHES=( "${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch + "${FILESDIR}"/${PN}-3.47.0-nonbash.patch ) _fossil_fetch() {