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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6006F1382C5 for ; Mon, 29 Mar 2021 17:42:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DA1DE0841; Mon, 29 Mar 2021 17:42:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61C22E0841 for ; Mon, 29 Mar 2021 17:42:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C506335D94 for ; Mon, 29 Mar 2021 17:42:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9018B632 for ; Mon, 29 Mar 2021 17:42:54 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1617039755.b2b164ba52c04ff6fb7b8879d35f0f08ee01aed9.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlite/sqlite-3.33.0.ebuild dev-db/sqlite/sqlite-3.34.0.ebuild dev-db/sqlite/sqlite-3.34.1.ebuild dev-db/sqlite/sqlite-3.35.0.ebuild dev-db/sqlite/sqlite-3.35.1.ebuild dev-db/sqlite/sqlite-3.35.2.ebuild dev-db/sqlite/sqlite-3.35.3.ebuild X-VCS-Directories: dev-db/sqlite/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b2b164ba52c04ff6fb7b8879d35f0f08ee01aed9 X-VCS-Branch: master Date: Mon, 29 Mar 2021 17:42:54 +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: 6b311846-133c-49b3-be77-5b1884e66cde X-Archives-Hash: 38df95fbacd039e687738c3f40bb5e9d commit: b2b164ba52c04ff6fb7b8879d35f0f08ee01aed9 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Mar 29 01:00:00 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Mar 29 17:42:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b164ba dev-db/sqlite: Fix Tcl dependency and detection. Fixes: f797e0fd4092a1d9e83c23005806a2db3d7bd0c2 Bug: https://bugs.gentoo.org/724578 Closes: https://bugs.gentoo.org/773967 Closes: https://github.com/gentoo/gentoo/pull/19972 Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org> Signed-off-by: Mike Gilbert gentoo.org> dev-db/sqlite/sqlite-3.33.0.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.34.0.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.34.1.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.35.0.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.35.1.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.35.2.ebuild | 11 +++++++++-- dev-db/sqlite/sqlite-3.35.3.ebuild | 11 +++++++++-- 7 files changed, 63 insertions(+), 14 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.33.0.ebuild b/dev-db/sqlite/sqlite-3.33.0.ebuild index 1237bba34ff..2ce5d1d4506 100644 --- a/dev-db/sqlite/sqlite-3.33.0.ebuild +++ b/dev-db/sqlite/sqlite-3.33.0.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -274,7 +274,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.34.0.ebuild b/dev-db/sqlite/sqlite-3.34.0.ebuild index 3e24d1239be..e9d419d08e7 100644 --- a/dev-db/sqlite/sqlite-3.34.0.ebuild +++ b/dev-db/sqlite/sqlite-3.34.0.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.34.1.ebuild b/dev-db/sqlite/sqlite-3.34.1.ebuild index 24baff37d52..623578707fa 100644 --- a/dev-db/sqlite/sqlite-3.34.1.ebuild +++ b/dev-db/sqlite/sqlite-3.34.1.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.35.0.ebuild b/dev-db/sqlite/sqlite-3.35.0.ebuild index d04438ce2cb..e1762793c34 100644 --- a/dev-db/sqlite/sqlite-3.35.0.ebuild +++ b/dev-db/sqlite/sqlite-3.35.0.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.35.1.ebuild b/dev-db/sqlite/sqlite-3.35.1.ebuild index d04438ce2cb..e1762793c34 100644 --- a/dev-db/sqlite/sqlite-3.35.1.ebuild +++ b/dev-db/sqlite/sqlite-3.35.1.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.35.2.ebuild b/dev-db/sqlite/sqlite-3.35.2.ebuild index d04438ce2cb..e1762793c34 100644 --- a/dev-db/sqlite/sqlite-3.35.2.ebuild +++ b/dev-db/sqlite/sqlite-3.35.2.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib. diff --git a/dev-db/sqlite/sqlite-3.35.3.ebuild b/dev-db/sqlite/sqlite-3.35.3.ebuild index d04438ce2cb..e1762793c34 100644 --- a/dev-db/sqlite/sqlite-3.35.3.ebuild +++ b/dev-db/sqlite/sqlite-3.35.3.ebuild @@ -40,7 +40,7 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" + tools? ( dev-lang/tcl:0= )" DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" @@ -311,7 +311,14 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - options+=(--enable-tcl) + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=(--disable-tcl) + fi if [[ "${CHOST}" == *-mint* ]]; then # sys/mman.h not available in MiNTLib.