Skip to content

Commit

Permalink
dep: bump rake-compiler-dock to 1.8.0 (#3404)
Browse files Browse the repository at this point in the history
**What problem is this PR intended to solve?**

Bump rake-compiler-dock to 1.8.0, see
https://github.com/rake-compiler/rake-compiler-dock/releases/tag/v1.8.0
  • Loading branch information
flavorjones authored Jan 6, 2025
2 parents e2b666f + dbfd8f8 commit b2a7890
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 24 deletions.
36 changes: 18 additions & 18 deletions .cross_rubies
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
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
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

0 comments on commit b2a7890

Please sign in to comment.