From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3BDB613888F for ; Fri, 23 Oct 2015 19:23:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A824EE0814; Fri, 23 Oct 2015 19:23:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 496F7E0814 for ; Fri, 23 Oct 2015 19:23:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06638340AA1 for ; Fri, 23 Oct 2015 19:23:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18F9B16AE for ; Fri, 23 Oct 2015 19:23:22 +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: <1445628157.ab6604a68ee222119673d5b02f1c4c5b85438667.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.9.1.ebuild X-VCS-Directories: dev-db/sqlite/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ab6604a68ee222119673d5b02f1c4c5b85438667 X-VCS-Branch: master Date: Fri, 23 Oct 2015 19:23:22 +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-Archives-Salt: c79e7ed8-140e-4c9b-a597-7bffdec964c1 X-Archives-Hash: c58eb8fc092c7abc0d397e5689711db5 commit: ab6604a68ee222119673d5b02f1c4c5b85438667 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Fri Oct 23 19:18:51 2015 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Oct 23 19:22:37 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6604a6 dev-db/sqlite: Fix building with USE="-tcl -test tools". dev-db/sqlite/sqlite-3.9.1.ebuild | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.9.1.ebuild b/dev-db/sqlite/sqlite-3.9.1.ebuild index 90bf609..235974d 100644 --- a/dev-db/sqlite/sqlite-3.9.1.ebuild +++ b/dev-db/sqlite/sqlite-3.9.1.ebuild @@ -162,13 +162,9 @@ multilib_src_configure() { # static-libs USE flag. options+=($(use_enable static-libs static)) - # tcl, test USE flags. + # tcl, test, tools USE flags. if full_tarball; then - if use tcl || use test; then - options+=(--enable-tcl) - else - options+=(--disable-tcl) - fi + options+=(--enable-tcl) fi if [[ "${CHOST}" == *-mint* ]]; then @@ -189,7 +185,7 @@ multilib_src_configure() { } multilib_src_compile() { - emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" + emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then emake showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer @@ -202,7 +198,7 @@ multilib_src_test() { return fi - emake $(use debug && echo fulltest || echo test) + emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) } multilib_src_install() {