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

dep: bump rake-compiler-dock to 1.8.0 #3404

Merged
merged 2 commits into from
Jan 6, 2025
Merged

dep: bump rake-compiler-dock to 1.8.0 #3404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5f2a83
dep: bump rake-compiler-dock to 1.8.0
flavorjones Jan 6, 2025
dbfd8f8
ext: update for rake-compiler-dock 1.8.0
flavorjones Jan 6, 2025
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
36 changes: 18 additions & 18 deletions .cross_rubies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
3.1.0:aarch64-linux-gnu
3.1.0:aarch64-linux-musl
3.1.0:arm-linux-gnu
3.1.0:arm-linux-musl
3.1.0:arm64-darwin
3.1.0:x64-mingw-ucrt
3.1.0:x86_64-darwin
3.1.0:x86_64-linux-gnu
3.1.0:x86_64-linux-musl
3.2.0:aarch64-linux-gnu
3.2.0:aarch64-linux-musl
3.2.0:arm-linux-gnu
3.2.0:arm-linux-musl
3.2.0:arm64-darwin
3.2.0:x64-mingw-ucrt
3.2.0:x86_64-darwin
3.2.0:x86_64-linux-gnu
3.2.0:x86_64-linux-musl
3.1.6:aarch64-linux-gnu
3.1.6:aarch64-linux-musl
3.1.6:arm-linux-gnu
3.1.6:arm-linux-musl
3.1.6:arm64-darwin
3.1.6:x64-mingw-ucrt
3.1.6:x86_64-darwin
3.1.6:x86_64-linux-gnu
3.1.6:x86_64-linux-musl
3.2.6:aarch64-linux-gnu
3.2.6:aarch64-linux-musl
3.2.6:arm-linux-gnu
3.2.6:arm-linux-musl
3.2.6:arm64-darwin
3.2.6:x64-mingw-ucrt
3.2.6:x86_64-darwin
3.2.6:x86_64-linux-gnu
3.2.6:x86_64-linux-musl
3.3.5:aarch64-linux-gnu
3.3.5:aarch64-linux-musl
3.3.5:arm-linux-gnu
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ group :development do

# building extensions
gem "rake-compiler", "1.2.8"
gem "rake-compiler-dock", "1.7.1"
gem "rake-compiler-dock", "1.8.0"

# parser generator
gem "rexical", "1.0.8"
Expand Down
6 changes: 1 addition & 5 deletions ext/nokogiri/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def do_clean
def needs_darwin_linker_hack
config_cross_build? &&
darwin? &&
Gem::Requirement.new("~> 3.2").satisfied_by?(Gem::Version.new(RbConfig::CONFIG["ruby_version"].split("+").first))
RbConfig::MAKEFILE_CONFIG["EXTDLDFLAGS"].include?("-bundle_loader")
end

#
Expand Down Expand Up @@ -764,10 +764,6 @@ def needs_darwin_linker_hack
cross_build_p = config_cross_build?
message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"

if needs_darwin_linker_hack
append_ldflags("-Wl,-flat_namespace")
end

require "yaml"
dependencies = YAML.load_file(File.join(PACKAGE_ROOT_DIR, "dependencies.yml"))

Expand Down
Loading