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 BD618138334 for ; Sat, 20 Jul 2019 18:46:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05F20E077F; Sat, 20 Jul 2019 18:46:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CEDCCE077F for ; Sat, 20 Jul 2019 18:46:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1FBE63481D8 for ; Sat, 20 Jul 2019 18:46:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E7C76D5 for ; Sat, 20 Jul 2019 18:46:31 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1563648129.b11baed16e9180017bec5cabbc54e7fac8461367.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/jimtcl/, dev-lang/jimtcl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/jimtcl/files/jimtcl-0.78-no-bootstrap.patch dev-lang/jimtcl/jimtcl-0.78-r2.ebuild X-VCS-Directories: dev-lang/jimtcl/ dev-lang/jimtcl/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b11baed16e9180017bec5cabbc54e7fac8461367 X-VCS-Branch: master Date: Sat, 20 Jul 2019 18:46:31 +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: 8d7e5037-4945-410c-9d82-14de81084e22 X-Archives-Hash: c5c6a02fe6410988be02f94c8e1c6c33 commit: b11baed16e9180017bec5cabbc54e7fac8461367 Author: Eugene Bright bright gdn> AuthorDate: Sun Jul 7 00:00:31 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 20 18:42:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11baed1 dev-lang/jimtcl-0.78-r2: Disable bootstrapping Make `autosetup/autosetup-find-tclsh` scripts use system `tclsh`. Forbid building `jimsh0`. Closes: https://bugs.gentoo.org/675276 Signed-off-by: Eugene Bright bright.gdn> Signed-off-by: Michał Górny gentoo.org> .../jimtcl/files/jimtcl-0.78-no-bootstrap.patch | 35 ++++++++++++++ dev-lang/jimtcl/jimtcl-0.78-r2.ebuild | 56 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/dev-lang/jimtcl/files/jimtcl-0.78-no-bootstrap.patch b/dev-lang/jimtcl/files/jimtcl-0.78-no-bootstrap.patch new file mode 100644 index 00000000000..dba8f1b5897 --- /dev/null +++ b/dev-lang/jimtcl/files/jimtcl-0.78-no-bootstrap.patch @@ -0,0 +1,35 @@ +From f59809579339c0a16fb2519e590b98b611438064 Mon Sep 17 00:00:00 2001 +From: Eugene Bright +Date: Sat, 20 Jul 2019 21:00:54 +0300 +Subject: [PATCH] autosetup/autosetup-find-tclsh: Rely on tclsh + +Never try to compile jimsh0. Use tclsh as build time dependency. +--- + autosetup/autosetup-find-tclsh | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/autosetup/autosetup-find-tclsh b/autosetup/autosetup-find-tclsh +index dfe70f8..78b521e 100755 +--- a/autosetup/autosetup-find-tclsh ++++ b/autosetup/autosetup-find-tclsh +@@ -3,15 +3,7 @@ + # If not found, builds a bootstrap jimsh from source + # Prefer $autosetup_tclsh if is set in the environment + d=`dirname "$0"` +-{ "$d/jimsh0" "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0 + PATH="$PATH:$d"; export PATH +-for tclsh in $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6; do +- { $tclsh "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0 +-done +-echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0" +-for cc in ${CC_FOR_BUILD:-cc} gcc; do +- { $cc -o "$d/jimsh0" "$d/jimsh0.c"; } 2>/dev/null || continue +- "$d/jimsh0" "$d/autosetup-test-tclsh" && exit 0 +-done +-echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc." ++tclsh "$d/autosetup-test-tclsh" 2>/dev/null && exit 0 ++echo 1>&2 "Please install dev-lang/tcl:0" + echo false +-- +2.20.1 + diff --git a/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild b/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild new file mode 100644 index 00000000000..3ac6eaadb70 --- /dev/null +++ b/dev-lang/jimtcl/jimtcl-0.78-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit eutils + +SRC_URI="https://github.com/msteveb/jimtcl/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86" + +DESCRIPTION="Small footprint implementation of Tcl programming language" +HOMEPAGE="http://jim.tcl.tk/" + +LICENSE="LGPL-2" +SLOT="0/78" # SONAME=libjim.so.0.78 +IUSE="doc static-libs" + +RDEPEND="" +DEPEND=" + doc? ( app-text/asciidoc ) + app-arch/unzip + dev-lang/tcl:0 +" + +PATCHES=" + ${FILESDIR}/${PN}-0.78-no-bootstrap.patch +" + +src_configure() { + CCACHE=None econf --with-jim-shared + if use static-libs ; then + # The build does not support doing both simultaneously. + mkdir static-libs || die + cd static-libs || die + CCACHE=None ECONF_SOURCE=${S} econf + fi +} + +src_compile() { + # Must build static-libs first. + use static-libs && emake -C static-libs libjim.a + emake all + use doc && emake docs +} + +src_install() { + dobin jimsh + use static-libs && dolib.a static-libs/libjim.a + ln -sf libjim.so.* libjim.so || die + dolib.so libjim.so* + insinto /usr/include + doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ + jim-win32compat.h jim-eventloop.h jim-config.h + dodoc AUTHORS README TODO + use doc && dohtml Tcl.html +}