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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E88C158020 for ; Tue, 8 Nov 2022 19:20:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09457E0A43; Tue, 8 Nov 2022 19:20:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 E8988E0A43 for ; Tue, 8 Nov 2022 19:20:29 +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 C42D3340E04 for ; Tue, 8 Nov 2022 19:20:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08D0770D for ; Tue, 8 Nov 2022 19:20:27 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1667932810.c958cef13ebc9f6c9ecc1d763833bc9a00cc07cb.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/shards.eclass X-VCS-Directories: eclass/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: c958cef13ebc9f6c9ecc1d763833bc9a00cc07cb X-VCS-Branch: dev Date: Tue, 8 Nov 2022 19:20:27 +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: a50df7fc-5bbe-434a-84ef-23e08887f0bc X-Archives-Hash: 5d4ee028abf85ddd55da1953dd743ed6 commit: c958cef13ebc9f6c9ecc1d763833bc9a00cc07cb Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Tue Nov 8 18:40:10 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Tue Nov 8 18:40:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c958cef1 shards.eclass: fix double EPREFIX Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> eclass/shards.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/shards.eclass b/eclass/shards.eclass index 548c86bce..95fe26226 100644 --- a/eclass/shards.eclass +++ b/eclass/shards.eclass @@ -37,7 +37,7 @@ QA_FLAGS_IGNORED='.*' # @FUNCTION: shards_get_libdir # @RETURN: the library path for Crystal packages shards_get_libdir() { - echo "${BROOT}"/usr/lib/shards + echo /usr/lib/shards } # @FUNCTION: shards_get_pkgname @@ -57,7 +57,7 @@ shards_src_configure() { crystal_configure einfo "CRYSTAL_OPTS='${CRYSTAL_OPTS}'" - export CRYSTAL_PATH="$(shards_get_libdir):$(crystal env CRYSTAL_PATH || die "'crystal env' failed")" + export CRYSTAL_PATH="${BROOT}$(shards_get_libdir):$(crystal env CRYSTAL_PATH || die "'crystal env' failed")" einfo "CRYSTAL_PATH='${CRYSTAL_PATH}'" tc-export CC @@ -113,7 +113,7 @@ shards_src_install() { fi if [[ -d "src" ]]; then - insinto "$(shards_get_libdir)/$(shards_get_pkgname)" + insinto $(shards_get_libdir)/$(shards_get_pkgname) doins -r src doins shard.yml fi