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 951B8158013 for ; Fri, 8 Dec 2023 00:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0C3B2BC013; Fri, 8 Dec 2023 00:29:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC1812BC013 for ; Fri, 8 Dec 2023 00:29:48 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0634335D0A for ; Fri, 8 Dec 2023 00:29:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8961BAF5 for ; Fri, 8 Dec 2023 00:29:46 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1701995381.0c9f132d03fc4bf0ef6200bc5cd282518d7eb855.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/chez/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/chez/chez-9.6.4-r1.ebuild dev-scheme/chez/chez-9.6.4.ebuild X-VCS-Directories: dev-scheme/chez/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 0c9f132d03fc4bf0ef6200bc5cd282518d7eb855 X-VCS-Branch: master Date: Fri, 8 Dec 2023 00:29:46 +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: 9317aaa6-178c-4c47-ae93-3f052f9aa7bf X-Archives-Hash: 533dd271e74167ee59d492b007ccdf77 commit: 0c9f132d03fc4bf0ef6200bc5cd282518d7eb855 Author: Maciej Barć gentoo org> AuthorDate: Thu Dec 7 22:33:06 2023 +0000 Commit: Maciej Barć gentoo org> CommitDate: Fri Dec 8 00:29:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9f132d dev-scheme/chez: translate for chez's --machine Signed-off-by: Maciej Barć gentoo.org> .../{chez-9.6.4.ebuild => chez-9.6.4-r1.ebuild} | 56 +++++++++++++++------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/dev-scheme/chez/chez-9.6.4.ebuild b/dev-scheme/chez/chez-9.6.4-r1.ebuild similarity index 63% rename from dev-scheme/chez/chez-9.6.4.ebuild rename to dev-scheme/chez/chez-9.6.4-r1.ebuild index dad71cf90e84..2e64fdec637c 100644 --- a/dev-scheme/chez/chez-9.6.4.ebuild +++ b/dev-scheme/chez/chez-9.6.4-r1.ebuild @@ -3,13 +3,14 @@ EAPI=8 -inherit toolchain-funcs +inherit edo toolchain-funcs DESCRIPTION="A programming language based on R6RS" -HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme" +HOMEPAGE="https://cisco.github.io/ChezScheme/ + https://github.com/cisco/ChezScheme/" SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/csv${PV//a}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/csv${PV//a} +S="${WORKDIR}/csv${PV//a}" # Chez Scheme itself is Apache 2.0, but it vendors Nanopass and stex # which are both MIT licensed. @@ -18,17 +19,18 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~x86" IUSE="X ncurses threads" -BDEPEND="virtual/pkgconfig" RDEPEND=" app-arch/lz4:= sys-apps/util-linux sys-libs/zlib:= + X? ( x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:= ) " -DEPEND="${RDEPEND}" -RDEPEND=" +DEPEND=" ${RDEPEND} - X? ( x11-libs/libX11 ) +" +BDEPEND=" + virtual/pkgconfig " src_prepare() { @@ -38,6 +40,7 @@ src_prepare() { if use ncurses ; then local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\"" + sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g" configure || die fi @@ -46,10 +49,22 @@ src_prepare() { } src_configure() { - local myconfargs=( - $(usex threads '--threads' '') - $(usex ncurses '' '--disable-curses') - $(usex X '' '--disable-x11') + # See official docs for translation guide. + # https://cisco.github.io/ChezScheme/release_notes/v9.6/release_notes.html + # "t" for threading + arch_map + "le" for Linux (hardcoded for now) + local -A arch_map=( + [amd64]=a6 + [arm]=arm32 + [ppc]=ppc32 + [x86]=i3 + ) + local machine="$(usex threads 't' '')${arch_map[${ARCH}]}le" + + local -a myconfargs=( + --machine="${machine}" + --libkernel + --nogzip-man-pages + --installprefix="/usr" --installbin="/usr/bin" --installlib="/usr/$(get_libdir)" @@ -57,12 +72,19 @@ src_configure() { --installschemename=chezscheme --installpetitename=chezscheme-petite --installscriptname=chezscheme-script - --libkernel - --nogzip-man-pages - LZ4=$($(tc-getPKG_CONFIG) --libs liblz4) - ZLIB=$($(tc-getPKG_CONFIG) --libs zlib) + + $(usex threads '--threads' '') + $(usex ncurses '' '--disable-curses') + $(usex X '' '--disable-x11') + + AR="$(tc-getAR)" + CC="$(tc-getCC)" + LD="$(tc-getLD)" + + LZ4="$($(tc-getPKG_CONFIG) --libs liblz4)" + ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" ) - sh ./configure "${myconfargs[@]}" || die + edob sh ./configure "${myconfargs[@]}" } src_install() { @@ -70,6 +92,6 @@ src_install() { emake TempRoot="${ED}" install einstalldocs - find "${ED}"/usr/$(get_libdir)/csv${PV//a}/examples \ + find "${ED}/usr/$(get_libdir)/csv${PV//a}/examples" \ \( -name "*.md" -o -name "*.so" \) -delete || die }