Fix compilation of Ruby 3.2.x on FreeBSD #2187

jarmo · 2023-04-14T19:16:57Z

Related to #2184

…ding it

mislav

Thanks for working on this!

How come these checks are scoped only to FreeBSD 11 or later?

mislav · 2023-04-17T10:07:59Z

bin/ruby-build

+      if pkg info -e libyaml > /dev/null; then
+        package_option ruby configure --with-libyaml-dir="$(pkg info --prefix libyaml | cut -wf2)"


Could we just get away with calling pkg info --prefix libyaml once instead of pkg info -e libyaml && pkg info --prefix?

And what is the full output of pkg info --prefix before it gets cut?

jarmo · 2023-04-18T16:41:01Z

How come these checks are scoped only to FreeBSD 11 or later?

Not sure. I used the same style as was used in the already committed/merged use_freebsd_readline function. Since I didn't understand the reason behind that check then I went with the safer choice of doing the same and not deviate away from it. Maybe it's time to remove these version checks everywhere since FreeBSD 10 is already EOL-ed?

Could we just get away with calling pkg info --prefix libyaml once instead of pkg info -e libyaml && pkg info --prefix?

It's possible. However I think that then we need to check for empty string after command pkg info -p libyaml 2>/dev/null | cut -wf2. Currently pkg info -e returns exit code 0 or 1 depending on the existance of the package:

root@freebsd:~ pkg info -e libyaml
root@freebsd:~ echo $?
0
root@freebsd:~ pkg info -e foo
root@freebsd:~ echo $?
1
root@freebsd:~ pkg info -p libyaml
libyaml-0.2.5                  /usr/local
root@freebsd:~ pkg info -p foo
pkg: No package(s) matching foo

Not sure what stdout is been redirected to /dev/null in use_freebsd_readline function when doing pkg info -e PKG, but as I wrote already then I followed the same style.

And what is the full output of pkg info --prefix before it gets cut?

Output is seen above.

mislav · 2023-04-19T13:54:18Z

However I think that then we need to check for empty string after command pkg info -p libyaml 2>/dev/null | cut -wf2

I'd vote for that approach instead of separately checking pkg info -e.

Maybe it's time to remove these version checks everywhere since FreeBSD 10 is already EOL-ed?

Yep, you're welcome to remove checks for FreeBSD 11! Thanks

jarmo · 2023-04-19T18:23:18Z

@mislav made all the relevant changes.

mislav

Thanks; looking good! Only style suggestions remain

mislav · 2023-04-20T10:07:09Z

bin/ruby-build

+
+freebsd_package_prefix() {
+  local package="$1"
+  echo "$(pkg info --prefix "$package" 2>/dev/null | cut -wf2)"


How about just unwrapping this instead of capturing the output and echo-ing it?

Suggested change

echo "$(pkg info --prefix "$package" 2>/dev/null | cut -wf2)"

pkg info --prefix "$package" 2>/dev/null | cut -wf2

Thanks for noticing this silly code :) Fixed it.

mislav · 2023-04-20T10:08:29Z

bin/ruby-build

+use_freebsd_yaml() {
+  if is_freebsd; then
+    local libyaml_prefix="$(freebsd_package_prefix libyaml)"
+    if [ "$libyaml_prefix" ]; then


Nit: although it might be functionally equivalent, I do like the explicitness of testing strings for not being blank, i.e.

Suggested change

if [ "$libyaml_prefix" ]; then

if [ -n "$libyaml_prefix" ]; then

Explicit checks added.

@jas14

This commit contains two updates: 20230424 and 20230428. ``` - 20230424: - Fall back on shasum if sha256sum is unavailable by @jas14 in rbenv/ruby-build#2177 - Mark EOL status to Ruby 2.6 and 2.7 by @hsbt in rbenv/ruby-build#2180 - Fix uploading SARIF reports from Differential Shellcheck by @mislav in rbenv/ruby-build#2181 - Fix compilation of Ruby 3.2.x on FreeBSD by @jarmo in rbenv/ruby-build#2187 - Fix truffleruby+graalvm-dev download URLs by @eregon in rbenv/ruby-build#2189 - 20230428: - Add TruffleRuby 23.0.0-preview1 by @eregon in rbenv/ruby-build#2190 - Add TruffleRuby+GraalVM 23.0.0-preview1 by @eregon in rbenv/ruby-build#2191 ```

@jas14

This commit contains two updates: 20230424 and 20230428. ``` - 20230424: - Fall back on shasum if sha256sum is unavailable by @jas14 in rbenv/ruby-build#2177 - Mark EOL status to Ruby 2.6 and 2.7 by @hsbt in rbenv/ruby-build#2180 - Fix uploading SARIF reports from Differential Shellcheck by @mislav in rbenv/ruby-build#2181 - Fix compilation of Ruby 3.2.x on FreeBSD by @jarmo in rbenv/ruby-build#2187 - Fix truffleruby+graalvm-dev download URLs by @eregon in rbenv/ruby-build#2189 - 20230428: - Add TruffleRuby 23.0.0-preview1 by @eregon in rbenv/ruby-build#2190 - Add TruffleRuby+GraalVM 23.0.0-preview1 by @eregon in rbenv/ruby-build#2191 ```

jarmo added 2 commits April 14, 2023 22:03

Use pkg info for readline/libedit prefix on FreeBSD instead of hardco…

ca741ca

…ding it

Use yaml and ffi installed via pkg on FreeBSD

8770b31

jarmo mentioned this pull request Apr 14, 2023

Installing Ruby 3.2.2 on FreeBSD fails due to missing libyaml even when it is installed #2184

Closed

mislav requested changes Apr 17, 2023

View reviewed changes

jarmo added 3 commits April 19, 2023 20:20

Remove check for FreeBSD version and allow all versions

806ff8e

Extract helper function for checking if OS is FreeBSD

2551225

Simplify reading FreeBSD package with pkg info command

295522f

mislav requested changes Apr 20, 2023

View reviewed changes

jarmo added 2 commits April 20, 2023 19:44

Remove unnecessary wrapping by echo

c5617a9

More explicit checks for FreeBSD package prefix

494b8aa

mislav approved these changes Apr 23, 2023

View reviewed changes

mislav merged commit b80e686 into rbenv:master Apr 23, 2023

halostatue mentioned this pull request Apr 25, 2023

ruby-build: Update to 20230428 macports/macports-ports#18409

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix compilation of Ruby 3.2.x on FreeBSD #2187

Fix compilation of Ruby 3.2.x on FreeBSD #2187

jarmo commented Apr 14, 2023 •

edited

Loading

mislav left a comment

mislav Apr 17, 2023

jarmo commented Apr 18, 2023 •

edited

Loading

mislav commented Apr 19, 2023

jarmo commented Apr 19, 2023

mislav left a comment

mislav Apr 20, 2023

jarmo Apr 20, 2023

mislav Apr 20, 2023

jarmo Apr 20, 2023

		if pkg info -e libyaml > /dev/null; then
		package_option ruby configure --with-libyaml-dir="$(pkg info --prefix libyaml \| cut -wf2)"

	echo "$(pkg info --prefix "$package" 2>/dev/null \| cut -wf2)"
	pkg info --prefix "$package" 2>/dev/null \| cut -wf2

	if [ "$libyaml_prefix" ]; then
	if [ -n "$libyaml_prefix" ]; then

Fix compilation of Ruby 3.2.x on FreeBSD #2187

Fix compilation of Ruby 3.2.x on FreeBSD #2187

Conversation

jarmo commented Apr 14, 2023 • edited Loading

mislav left a comment

Choose a reason for hiding this comment

mislav Apr 17, 2023

Choose a reason for hiding this comment

jarmo commented Apr 18, 2023 • edited Loading

mislav commented Apr 19, 2023

jarmo commented Apr 19, 2023

mislav left a comment

Choose a reason for hiding this comment

mislav Apr 20, 2023

Choose a reason for hiding this comment

jarmo Apr 20, 2023

Choose a reason for hiding this comment

mislav Apr 20, 2023

Choose a reason for hiding this comment

jarmo Apr 20, 2023

Choose a reason for hiding this comment

jarmo commented Apr 14, 2023 •

edited

Loading

jarmo commented Apr 18, 2023 •

edited

Loading