From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 24F551580E0 for ; Thu, 30 Jan 2025 17:44:20 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F3BC334315F for ; Thu, 30 Jan 2025 17:44:19 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4D7B4110471; Thu, 30 Jan 2025 17:44:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 bobolink.gentoo.org (Postfix) with ESMTPS id 436EA110471 for ; Thu, 30 Jan 2025 17:44:15 +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 E3957343109 for ; Thu, 30 Jan 2025 17:44:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D1132195 for ; Thu, 30 Jan 2025 17:44:13 +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: <1738259048.b1589285ccdda25dd0a9b7c058484ca031e0c45f.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/crystal/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/crystal/crystal-1.15.0-r1.ebuild dev-lang/crystal/crystal-1.15.0.ebuild X-VCS-Directories: dev-lang/crystal/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: b1589285ccdda25dd0a9b7c058484ca031e0c45f X-VCS-Branch: master Date: Thu, 30 Jan 2025 17:44:13 +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: 6856df2b-80ab-4a27-9aa9-76a5da15c6bc X-Archives-Hash: 80b4e40a2e303b8caec78643d7a36f2d commit: b1589285ccdda25dd0a9b7c058484ca031e0c45f Author: Alfred Wingate protonmail com> AuthorDate: Thu Jan 30 11:52:55 2025 +0000 Commit: Maciej Barć gentoo org> CommitDate: Thu Jan 30 17:44:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1589285 dev-lang/crystal: do not link against prebuilt libgc https://github.com/crystal-lang/crystal/issues/12035#issuecomment-2522606612 https://github.com/crystal-lang/distribution-scripts/tree/master/linux#linux-x86_64-static-build > The x86_64 crystal build is built inside an alpine linux container as a > statically linked binary using musl libc. libgc is built on debian to make > it work on glibc. Bug: https://bugs.gentoo.org/931100 Bug: https://bugs.gentoo.org/929123 Bug: https://bugs.gentoo.org/929989 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Maciej Barć gentoo.org> .../crystal/{crystal-1.15.0.ebuild => crystal-1.15.0-r1.ebuild} | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev-lang/crystal/crystal-1.15.0.ebuild b/dev-lang/crystal/crystal-1.15.0-r1.ebuild similarity index 89% rename from dev-lang/crystal/crystal-1.15.0.ebuild rename to dev-lang/crystal/crystal-1.15.0-r1.ebuild index 4ceb85f7e207..18e05915d1a8 100644 --- a/dev-lang/crystal/crystal-1.15.0.ebuild +++ b/dev-lang/crystal/crystal-1.15.0-r1.ebuild @@ -55,6 +55,15 @@ PATCHES=( "${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix-2.patch" ) +src_prepare() { + default + + # Link against system boehm-gc instead of upstream prebuilt static library + # bug #929123, #929989 and #931100 + # https://github.com/crystal-lang/crystal/issues/12035#issuecomment-2522606612 + rm "${WORKDIR}/crystal-${BV}"/lib/crystal/libgc.a || die +} + src_configure() { local bootstrap_path="${WORKDIR}/${PN}-${BV}/bin" if [[ ! -d "${bootstrap_path}" ]] ; then