Bug 835038

Summary:	dev-lang/ruby-3.1.1 - patch -p1 failed with /var/tmp/portage/dev-lang/ruby-3.1.1/files/3.0/900-musl-coroutine.patch
Product:	Gentoo Linux	Reporter:	Toralf Förster <toralf>
Component:	Current packages	Assignee:	Gentoo musl team <musl>
Status:	RESOLVED DUPLICATE
Severity:	normal	CC:	aladjev.andrew, ruby, sam
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	emerge-info.txt dev-lang:ruby-3.1.1:20220312-224545.log emerge-history.txt environment etc.portage.tar.bz2 temp.tar.bz2

Description Toralf Förster gentoo-dev

2022-03-13 09:28:27 UTC

Hunk #1 FAILED at 2364.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
 [ !! ]
 * ERROR: dev-lang/ruby-3.1.1::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/dev-lang/ruby-3.1.1/files/3.0/900-musl-coroutine.patch
 * 
 * Call stack:

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 17.0_musl_hardened-j4-20220312-210044

  -------------------------------------------------------------------

gcc-config -l:
 [1] x86_64-gentoo-linux-musl-11.2.1 *
clang/llvm (if any):
Python 3.9.10
Available Ruby profiles:
  [1]   ruby26
  [2]   ruby27 *
php cli:

  HEAD of ::gentoo
commit 26351694182d5ee0f34fe5204c112e55bb22d737
Author: Repository mirror & CI <repomirrorci@gentoo.org>
Date:   Sat Mar 12 21:04:52 2022 +0000

    2022-03-12 21:04:51 UTC

emerge -qpvO dev-lang/ruby
[ebuild  NS   ] dev-lang/ruby-3.1.1 [2.6.9, 2.7.5] USE="ipv6 rdoc ssl -berkdb -debug -doc -examples -gdbm -jemalloc -jit -rubytests -socks5 -static-libs -systemtap -tk -xemacs"

Comment 1 Toralf Förster gentoo-dev

2022-03-13 09:28:30 UTC

Created attachment 766912 [details]
emerge-info.txt

Comment 2 Toralf Förster gentoo-dev

2022-03-13 09:28:31 UTC

Created attachment 766913 [details]
dev-lang:ruby-3.1.1:20220312-224545.log

Comment 3 Toralf Förster gentoo-dev

2022-03-13 09:28:32 UTC

Created attachment 766914 [details]
emerge-history.txt

Comment 4 Toralf Förster gentoo-dev

2022-03-13 09:28:35 UTC

Created attachment 766915 [details]
environment

Comment 5 Toralf Förster gentoo-dev

2022-03-13 09:28:35 UTC

Created attachment 766916 [details]
etc.portage.tar.bz2

Comment 6 Toralf Förster gentoo-dev

2022-03-13 09:28:36 UTC

Created attachment 766917 [details]
temp.tar.bz2

Comment 7 Andrew Aladjev 2022-03-30 21:02:50 UTC

Hello, thank you for bug report.

`900-musl-coroutine.patch` has been created for ruby 2.7 and ruby 3.0. Fix has been applied to upstream (and updated too) started from ruby 3.1.0 https://github.com/ruby/ruby/blame/v3_1_0/configure.ac#L2592-L2596. We can see that our fix is not required for ruby:3.1+ anymore.

Today I've reproduced this issue, than removed file `/var/db/repos/gentoo/dev-lang/ruby/files/3.1/900-musl-coroutine.patch` and updated test image `i686-unknown-linux-gnu` with ruby 3.1. All my ruby application tests works perfect.

So I think we may just remove `files/3.1/900-musl-coroutine.patch` and issue can be resolved.

Thank you.

Comment 8 Andrew Aladjev 2022-03-31 07:55:35 UTC

For me workaround looks as follows:

rm /var/db/repos/gentoo/dev-lang/ruby/files/3.1/900-musl-*.patch
sed -i 's/use elibc_musl/[false]/' /var/db/repos/gentoo/dev-lang/ruby/ruby-3.1.1.ebuild
ebuild /var/db/repos/gentoo/dev-lang/ruby/ruby-3.1.1.ebuild manifest

Comment 9 Toralf Förster gentoo-dev

2022-04-19 19:09:51 UTC


*** This bug has been marked as a duplicate of bug 839552 ***

Comment 10 Larry the Git Cow gentoo-dev

2022-04-19 19:11:18 UTC

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5b8f7263012b2746647fbca64937e6900d16ff

commit 4b5b8f7263012b2746647fbca64937e6900d16ff
Author:     Sam James <sam@gentoo.org>
AuthorDate: 2022-04-19 19:10:59 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2022-04-19 19:10:59 +0000

    dev-lang/ruby: drop unnecessary musl patch for 3.1
    
    Closes: https://bugs.gentoo.org/835038
    Closes: https://bugs.gentoo.org/839552
    Signed-off-by: Sam James <sam@gentoo.org>

 dev-lang/ruby/files/3.1/900-musl-coroutine.patch | 28 ------------------------
 1 file changed, 28 deletions(-)

Comment 11 Sam James archtester

2022-04-19 19:11:36 UTC

(In reply to Andrew Aladjev from comment #7)
> Hello, thank you for bug report.
> 
> `900-musl-coroutine.patch` has been created for ruby 2.7 and ruby 3.0. Fix
> has been applied to upstream (and updated too) started from ruby 3.1.0
> https://github.com/ruby/ruby/blame/v3_1_0/configure.ac#L2592-L2596. We can
> see that our fix is not required for ruby:3.1+ anymore.
> 
> Today I've reproduced this issue, than removed file
> `/var/db/repos/gentoo/dev-lang/ruby/files/3.1/900-musl-coroutine.patch` and
> updated test image `i686-unknown-linux-gnu` with ruby 3.1. All my ruby
> application tests works perfect.
> 
> So I think we may just remove `files/3.1/900-musl-coroutine.patch` and issue
> can be resolved.
> 
> Thank you.

thank you!

Comment 12 Sam James archtester

2022-04-19 19:11:49 UTC


*** This bug has been marked as a duplicate of bug 839552 ***