Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation of Ruby 3.2.x on FreeBSD #2187

Merged
merged 7 commits into from
Apr 23, 2023
Merged

Fix compilation of Ruby 3.2.x on FreeBSD #2187

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca741ca
Use pkg info for readline/libedit prefix on FreeBSD instead of hardco…
jarmo Apr 14, 2023
8770b31
Use yaml and ffi installed via pkg on FreeBSD
jarmo Apr 14, 2023
806ff8e
Remove check for FreeBSD version and allow all versions
jarmo Apr 19, 2023
2551225
Extract helper function for checking if OS is FreeBSD
jarmo Apr 19, 2023
295522f
Simplify reading FreeBSD package with pkg info command
jarmo Apr 19, 2023
c5617a9
Remove unnecessary wrapping by echo
jarmo Apr 20, 2023
494b8aa
More explicit checks for FreeBSD package prefix
jarmo Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 41 additions & 14 deletions bin/ruby-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,15 @@ is_mac() {
[ $# -eq 0 ] || [ "$(osx_version)" "$@" ]
}

is_freebsd() {
[ "$(uname -s)" = "FreeBSD" ]
}

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing this silly code :) Fixed it.

}

# 9.1 -> 901
# 10.9 -> 1009
# 10.10 -> 1010
Expand Down Expand Up @@ -561,14 +570,17 @@ build_package_standard_build() {
if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-readline-dir=* ]]; then
use_homebrew_readline || use_freebsd_readline || true
fi
if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-libffi-dir=* ]]; then
use_freebsd_libffi || true
fi
if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-libyaml-dir=* ]]; then
use_homebrew_yaml || true
use_homebrew_yaml || use_freebsd_yaml || true
fi
if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-gmp-dir=* ]]; then
use_homebrew_gmp || true
fi
if [[ "$RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[*]}" != *--with-openssl-dir=* ]]; then
if [ "FreeBSD" = "$(uname -s)" ] && [ -f /usr/local/include/openssl/ssl.h ]; then
if is_freebsd && [ -f /usr/local/include/openssl/ssl.h ]; then
# use openssl installed from Ports Collection
package_option ruby configure --with-openssl-dir="/usr/local"
fi
Expand Down Expand Up @@ -1040,6 +1052,15 @@ use_homebrew_yaml() {
fi
}

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicit checks added.

package_option ruby configure --with-libyaml-dir="$libyaml_prefix"
fi
fi
}

use_homebrew_gmp() {
local libdir="$(brew --prefix gmp 2>/dev/null || true)"
if [ -d "$libdir" ]; then
Expand All @@ -1051,17 +1072,14 @@ use_homebrew_gmp() {
}

use_freebsd_readline() {
if [ "FreeBSD" = "$(uname -s)" ]; then
local release="$(uname -r)"
if [ "${release%%.*}" -ge 11 ]; then
if pkg info -e readline > /dev/null; then
# use readline from Ports Collection
package_option ruby configure --with-readline-dir="/usr/local"
elif pkg info -e libedit > /dev/null; then
# use libedit from Ports Collection
package_option ruby configure --enable-libedit
package_option ruby configure --with-libedit-dir="/usr/local"
fi
if is_freebsd; then
local readline_prefix="$(freebsd_package_prefix readline)"
local libedit_prefix="$(freebsd_package_prefix libedit)"
if [ "$readline_prefix" ]; then
package_option ruby configure --with-readline-dir="$readline_prefix"
elif [ "$libedit_prefix" ]; then
package_option ruby configure --enable-libedit
package_option ruby configure --with-libedit-dir="$libedit_prefix"
fi
fi
}
Expand All @@ -1076,6 +1094,15 @@ use_homebrew_readline() {
fi
}

use_freebsd_libffi() {
if is_freebsd; then
local libffi_prefix="$(freebsd_package_prefix libffi)"
if [ "$libffi_prefix" ]; then
package_option ruby configure --with-libffi-dir="$libffi_prefix"
fi
fi
}

has_broken_mac_openssl() {
is_mac || return 1
local openssl_version="$(/usr/bin/openssl version 2>/dev/null || true)"
Expand Down Expand Up @@ -1474,7 +1501,7 @@ if [ -z "$(locate_gcc)" ]; then
fi

if [ -z "$MAKE" ]; then
if [ "FreeBSD" = "$(uname -s)" ]; then
if is_freebsd; then
# Workaround for Ruby bug 16331: https://bugs.ruby-lang.org/issues/16331
# Due to this bug, build will fail with FreeBSD's make after #1368
# The bug is already fixed in upstream but GNU make is still required
Expand Down