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 257C1138334 for ; Tue, 4 Sep 2018 08:19:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F295CE085D; Tue, 4 Sep 2018 08:19:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B245EE085D for ; Tue, 4 Sep 2018 08:19:46 +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 F028C335CC3 for ; Tue, 4 Sep 2018 08:19:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 119863C4 for ; Tue, 4 Sep 2018 08:19:42 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1536049165.4504ee0e021e5e9cd2b7c8f10af9c16cf8c31627.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/crystal/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/crystal/crystal-0.26.0.ebuild dev-lang/crystal/crystal-0.26.1.ebuild X-VCS-Directories: dev-lang/crystal/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 4504ee0e021e5e9cd2b7c8f10af9c16cf8c31627 X-VCS-Branch: master Date: Tue, 4 Sep 2018 08:19: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-Archives-Salt: 556214f1-32a4-4d34-955f-ab2981331087 X-Archives-Hash: b59518c4ad396e00f1798f5734d972f4 commit: 4504ee0e021e5e9cd2b7c8f10af9c16cf8c31627 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Sep 4 08:06:47 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Sep 4 08:19:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4504ee0e dev-lang/crystal: fix PATH path when bootstrapping Before crystal-0.25.0 binary tarball directories did not contain '-' revisions: crystal-0.24.2-1-linux-x86_64 -> crystal-0.24.2 After crystal-0.25.0 they did: crystal-0.25.1-1-linux-x86_64 -> crystal-0.25.1-1 Ebuild missed the change and kept passing PATH without '-' revision. This change resotres revision for crystal-0.26.0, 0.26.1 and adds sanity check to make sure expected directry is in place. Should help catching the failure next time. Reported-by: Myrddin Emrys Bug: https://github.com/crystal-lang/crystal/issues/6650 Package-Manager: Portage-2.3.49, Repoman-2.3.10 dev-lang/crystal/crystal-0.26.0.ebuild | 10 +++++----- dev-lang/crystal/crystal-0.26.1.ebuild | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dev-lang/crystal/crystal-0.26.0.ebuild b/dev-lang/crystal/crystal-0.26.0.ebuild index 033b3eb6c94..59268e937a6 100644 --- a/dev-lang/crystal/crystal-0.26.0.ebuild +++ b/dev-lang/crystal/crystal-0.26.0.ebuild @@ -5,15 +5,15 @@ EAPI=6 inherit bash-completion-r1 llvm multiprocessing toolchain-funcs -BV=0.25.1 -BV_AMD64=${BV}-1-linux-x86_64 -BV_X86=${BV}-1-linux-i686 +BV=0.25.1-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 DESCRIPTION="The Crystal Programming Language" HOMEPAGE="https://crystal-lang.org" SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz - amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz ) - x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )" + amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" LICENSE="Apache-2.0" SLOT="0" diff --git a/dev-lang/crystal/crystal-0.26.1.ebuild b/dev-lang/crystal/crystal-0.26.1.ebuild index d02b47f0788..7d0ff4c7b5b 100644 --- a/dev-lang/crystal/crystal-0.26.1.ebuild +++ b/dev-lang/crystal/crystal-0.26.1.ebuild @@ -5,15 +5,15 @@ EAPI=6 inherit bash-completion-r1 llvm multiprocessing toolchain-funcs -BV=0.26.0 -BV_AMD64=${BV}-1-linux-x86_64 -BV_X86=${BV}-1-linux-i686 +BV=0.26.0-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 DESCRIPTION="The Crystal Programming Language" HOMEPAGE="https://crystal-lang.org" SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz - amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz ) - x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )" + amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" LICENSE="Apache-2.0" SLOT="0" @@ -53,6 +53,12 @@ src_prepare() { } src_compile() { + local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin + if [[ ! -d ${bootstrap_path} ]]; then + eerror "Binary tarball does not contain expected directory:" + die "'${bootstrap_path}' path does not exist." + fi + emake \ $(usex debug "" release=1) \ progress=true \ @@ -64,7 +70,7 @@ src_compile() { CXX=$(tc-getCXX) \ AR=$(tc-getAR) \ \ - PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \ + PATH="${bootstrap_path}:${PATH}" \ CRYSTAL_PATH=src \ CRYSTAL_CONFIG_VERSION=${PV} \ CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"