rake-compiler-dock 1.4.0.rc2 → 1.5.0.rc1

data/Rakefile

@@ -9,15 +9,20 @@ CLEAN.include("tmp")
 RakeCompilerDock::GemHelper.install_tasks
 
 platforms = [
-  ["x86-mingw32", "i686-w64-mingw32"],
-  ["x64-mingw32", "x86_64-w64-mingw32"],
+  # tuple is [platform, target]
+  ["aarch64-linux-gnu", "aarch64-linux-gnu"],
+  ["aarch64-linux-musl", "aarch64-linux-musl"],
+  ["arm-linux-gnu", "arm-linux-gnueabihf"],
+  ["arm-linux-musl", "arm-linux-musleabihf"],
+  ["arm64-darwin", "aarch64-apple-darwin"],
   ["x64-mingw-ucrt", "x86_64-w64-mingw32"],
-  ["x86-linux", "i686-redhat-linux"],
-  ["x86_64-linux", "x86_64-redhat-linux"],
+  ["x64-mingw32", "x86_64-w64-mingw32"],
+  ["x86-linux-gnu", "i686-redhat-linux-gnu"],
+  ["x86-linux-musl", "i686-unknown-linux-musl"],
+  ["x86-mingw32", "i686-w64-mingw32"],
   ["x86_64-darwin", "x86_64-apple-darwin"],
-  ["arm64-darwin", "aarch64-apple-darwin"],
-  ["arm-linux", "arm-linux-gnueabihf"],
-  ["aarch64-linux", "aarch64-linux-gnu"],
+  ["x86_64-linux-gnu", "x86_64-redhat-linux-gnu"],
+  ["x86_64-linux-musl", "x86_64-unknown-linux-musl"],
 ]
 
 namespace :build do
@@ -30,6 +35,9 @@ namespace :build do
     task sdf do
       image_name = RakeCompilerDock::Starter.container_image_name(platform: platform)
       sh(*RakeCompilerDock.docker_build_cmd(platform), "-t", image_name, "-f", "Dockerfile.mri.#{platform}", ".")
+      if image_name.include?("linux-gnu")
+        sh("docker", "tag", image_name, image_name.sub("linux-gnu", "linux"))
+      end
     end
 
     df = ERB.new(File.read("Dockerfile.mri.erb"), trim_mode: ">").result(binding)
@@ -78,14 +86,22 @@ end
 
 desc "Update predefined_user_group.rb"
 task :update_lists do
+  def get_user_list(platform)
+    puts "getting user list from #{platform} ..."
+    `RCD_PLATFORM=#{platform} rake-compiler-dock bash -c "getent passwd"`.each_line.map do |line|
+      line.chomp.split(":")[0]
+    end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_user_name(`id -nu`.chomp)]
+  end
 
-  users = `rake-compiler-dock bash -c "getent passwd"`.each_line.map do |line|
-    line.chomp.split(":")[0]
-  end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_user_name(`id -nu`.chomp)]
+  def get_group_list(platform)
+    puts "getting group list from #{platform} ..."
+    `RCD_PLATFORM=#{platform} rake-compiler-dock bash -c "getent group"`.each_line.map do |line|
+      line.chomp.split(":")[0]
+    end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_group_name(`id -ng`.chomp)]
+  end
 
-  groups = `rake-compiler-dock bash -c "getent group"`.each_line.map do |line|
-    line.chomp.split(":")[0]
-  end.compact.reject(&:empty?) - [RakeCompilerDock::Starter.make_valid_group_name(`id -ng`.chomp)]
+  users = platforms.flat_map { |platform, _| get_user_list(platform) }.uniq.sort
+  groups = platforms.flat_map { |platform, _| get_group_list(platform) }.uniq.sort
 
   File.open("lib/rake_compiler_dock/predefined_user_group.rb", "w") do |fd|
     fd.puts <<-EOT

data/build/mk_musl_cross.sh

@@ -0,0 +1,37 @@
+#! /usr/bin/env bash
+
+set -o errexit
+set -o pipefail
+set -x
+
+# check if target is provided as the first argument, and exit if not
+if [ -z "$1" ]; then
+    echo "No target provided"
+    exit 1
+fi
+TARGET=$1
+
+git clone --depth 1 https://github.com/richfelker/musl-cross-make.git
+pushd musl-cross-make
+
+cat > config.mak <<EOF
+TARGET = $TARGET
+
+DL_CMD = wget -c --no-verbose -O
+
+# to match the location of the apt-installed cross-compiler packages
+OUTPUT = /usr
+
+# Recommended options for faster/simpler build:
+COMMON_CONFIG += --disable-nls
+GCC_CONFIG += --enable-languages=c,c++
+GCC_CONFIG += --disable-libquadmath --disable-decimal-float
+GCC_CONFIG += --disable-multilib
+EOF
+
+make -j$(nproc) install
+
+popd
+
+# cleanup
+rm -rf musl-cross-make

data/build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch

@@ -1,8 +1,8 @@
 diff --git a/tasks/bin/cross-ruby.rake b/tasks/bin/cross-ruby.rake
-index 8317a2a..5a1b3ea 100644
+index 8317a2a3..8ed21718 100644
 --- a/tasks/bin/cross-ruby.rake
 +++ b/tasks/bin/cross-ruby.rake
-@@ -116,10 +116,22 @@ RUBY_CC_VERSIONS.split(":").each do |ruby_cc_version|
+@@ -116,11 +116,27 @@
          "--host=#{mingw_host}",
          "--target=#{mingw_target}",
          "--build=#{RUBY_BUILD}",
@@ -12,7 +12,8 @@ index 8317a2a..5a1b3ea 100644
          '--disable-install-doc',
          '--with-ext=',
        ]
-+      if mingw_host=~/darwin/
+ 
++      if mingw_host =~ /darwin/
 +        options += [
 +          '--enable-static',
 +          '--disable-shared',
@@ -23,6 +24,10 @@ index 8317a2a..5a1b3ea 100644
 +          '--enable-shared',
 +        ]
 +      end
- 
++
++      # https://github.com/docker-library/ruby/issues/308
++      options << "--with-coroutine=arm32" if major == "2.7" && mingw_target =~ /arm-linux-musl/
++
        # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
        options << "--with-winsock2" if major == "1.8"
+       options << "--prefix=#{install_dir}"

data/build/runas

@@ -2,6 +2,6 @@
 
 groupadd -o -g "$GID" "$GROUP"
 mkdir -p /tmp/home
-useradd -o -g "$GID" -u "$UID" -G rvm,sudo -p "" -b /tmp/home -m "$USER"
+useradd -o -g "$GID" -u "$UID" -G rubyuser,sudo -p "" -b /tmp/home -m "$USER"
 
 /usr/bin/sudo -u "$USER" -H BASH_ENV=/etc/rubybashrc -- "$@"

data/lib/rake_compiler_dock/predefined_user_group.rb

@@ -1,5 +1,5 @@
       # DO NOT EDIT - This file is generated per 'rake update_lists'
       module RakeCompilerDock
-        PredefinedUsers = ["root", "daemon", "bin", "sys", "sync", "games", "man", "lp", "mail", "news", "uucp", "proxy", "www-data", "backup", "list", "irc", "gnats", "nobody", "_apt", "rvm"]
-        PredefinedGroups = ["root", "daemon", "bin", "sys", "adm", "tty", "disk", "lp", "mail", "news", "uucp", "man", "proxy", "kmem", "dialout", "fax", "voice", "cdrom", "floppy", "tape", "sudo", "audio", "dip", "www-data", "backup", "operator", "list", "irc", "src", "gnats", "shadow", "utmp", "video", "sasl", "plugdev", "staff", "games", "users", "nogroup", "ssh", "rvm"]
+        PredefinedUsers = ["_apt", "adm", "backup", "bin", "daemon", "dbus", "ftp", "games", "gnats", "halt", "irc", "list", "lp", "mail", "man", "news", "nobody", "operator", "proxy", "root", "rubyuser", "shutdown", "sync", "sys", "systemd-network", "uucp", "www-data"]
+        PredefinedGroups = ["adm", "audio", "backup", "bin", "cdrom", "cgred", "daemon", "dbus", "dialout", "dip", "disk", "fax", "floppy", "ftp", "games", "gnats", "input", "irc", "kmem", "list", "lock", "lp", "mail", "man", "mem", "news", "nobody", "nogroup", "operator", "plugdev", "proxy", "root", "rubyuser", "sasl", "shadow", "src", "ssh", "ssh_keys", "staff", "sudo", "sys", "systemd-journal", "systemd-network", "tape", "tty", "users", "utempter", "utmp", "uucp", "video", "voice", "wheel", "www-data"]
       end

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.4.0.rc2"
-  IMAGE_VERSION = "1.4.0.rc2"
+  VERSION = "1.5.0.rc1"
+  IMAGE_VERSION = "1.5.0.rc1"
 end

data/lib/rake_compiler_dock.rb

@@ -26,7 +26,8 @@ module RakeCompilerDock
   #
   # Option +:platform+ can be set to a list of space separated values.
   # It selects the docker image(s) with an appropriate toolchain.
-  # Allowed values are +:x86-mingw32+, +x64-mingw32+, +x86-linux+ or +x86_64-linux+.
+  # Allowed values are +aarch64-linux-gnu+, +arm-linux-gnu+, +arm64-darwin+, +x64-mingw-ucrt+,
+  # +x64-mingw32+, +x86-linux-gnu+, +x86-mingw32+, +x86_64-darwin+, +x86_64-linux-gnu+.
   # If the list contains multiple values, +cmd+ is consecutively executed in each of the docker images,
   # Option +:platform+ is ignored when +:rubyvm+ is set to +:jruby+.
   # Default is "x86-mingw32 x64-mingw32" .

data/rake-compiler-dock.gemspec

@@ -17,7 +17,13 @@ Use rake-compiler-dock to enter an interactive shell session or add a task to yo
 #  However we do the version check at runtime.
 #  spec.required_ruby_version = '>= 1.9.2'
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files = begin
+    `git ls-files -z`.split("\x0")
+  rescue StandardError => e
+    warn "WARNING: Could not discover files for gemspec: #{e}"
+    []
+  end
+
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/test/rcd_test/Rakefile

@@ -18,7 +18,25 @@ else
     ext.ext_dir = 'ext/mri'
     ext.lib_dir = 'lib/rcd_test'
     ext.cross_compile = true
-    ext.cross_platform = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32 x86-linux x86_64-linux aarch64-linux arm-linux x86_64-darwin arm64-darwin]
+    ext.cross_platform = %w[
+      aarch64-linux
+      aarch64-linux-gnu
+      aarch64-linux-musl
+      arm-linux
+      arm-linux-gnu
+      arm-linux-musl
+      arm64-darwin
+      x64-mingw-ucrt
+      x64-mingw32
+      x86-linux
+      x86-linux-gnu
+      x86-linux-musl
+      x86-mingw32
+      x86_64-darwin
+      x86_64-linux
+      x86_64-linux-gnu
+      x86_64-linux-musl
+    ]
   end
 end
 

data/test/rcd_test/ext/mri/rcd_test_ext.c

@@ -40,6 +40,19 @@ rcdt_darwin_builtin_available_eh(VALUE self)
 #endif
 }
 
+static VALUE
+rcdt_largefile_op_removed_from_musl(VALUE self)
+{
+  // Reference a symbol that was removed in Musl 1.24 🙄
+  // https://github.com/sparklemotion/sqlite3-ruby/issues/434
+#ifdef __linux__
+  posix_fallocate(STDERR_FILENO, 0, 0);
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 void
 Init_rcd_test_ext(void)
 {
@@ -48,4 +61,5 @@ Init_rcd_test_ext(void)
   rb_define_singleton_method(rb_mRcdTest, "darwin_builtin_available?", rcdt_darwin_builtin_available_eh, 0);
   rb_define_singleton_method(rb_mRcdTest, "isinf?", rcdt_isinf_eh, 1);
   rb_define_singleton_method(rb_mRcdTest, "isnan?", rcdt_isnan_eh, 1);
+  rb_define_singleton_method(rb_mRcdTest, "largefile_op_removed_from_musl", rcdt_largefile_op_removed_from_musl, 0);
 }

data/test/rcd_test/ext/mri/rcd_test_ext.h

@@ -1,6 +1,11 @@
 #ifndef RCD_TEST_EXT_H
 #define RCD_TEST_EXT_H 1
 
+// see rcdt_largefile_op_removed_from_musl
+#define _LARGEFILE_SOURCE 1
+#define _FILE_OFFSET_BITS 64
+#include <fcntl.h>
+
 #include "ruby.h"
 
 #endif /* RCD_TEST_EXT_H */

data/test/rcd_test/rcd_test.gemspec

@@ -12,16 +12,17 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
   spec.license = "MIT"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
-  end
+  spec.files = [
+    "ext/java/RcdTestExtService.java",
+    "ext/java/RubyRcdTest.java",
+    "ext/mri/extconf.rb",
+    "ext/mri/rcd_test_ext.c",
+    "ext/mri/rcd_test_ext.h",
+    "lib/rcd_test.rb",
+  ]
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.extensions    = ["ext/mri/extconf.rb"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
 end

data/test/rcd_test/test/test_basic.rb

@@ -22,10 +22,17 @@ class TestBasic < Minitest::Test
 
   def test_floating_point_classification_macros
     skip("jruby should not run libc-specific tests") if RUBY_ENGINE == "jruby"
+
     refute(RcdTest.isinf?(42.0))
     assert(RcdTest.isinf?(Float::INFINITY))
     refute(RcdTest.isnan?(42.0))
     assert(RcdTest.isnan?(Float::NAN))
   end
 
+  def test_largefile_op_removed_from_musl
+    skip("jruby should not run libc-specific tests") if RUBY_ENGINE == "jruby"
+
+    is_linux = RUBY_PLATFORM.include?("linux")
+    assert_equal(is_linux, RcdTest.largefile_op_removed_from_musl)
+  end
 end

data/test/test_starter.rb

@@ -11,8 +11,8 @@ class TestStarter < Test::Unit::TestCase
   def test_make_valid_user_name
     assert_equal "mouse-click", Starter.make_valid_user_name("Mouse-Click")
     assert_equal "very_very_very_l-ame_with_spaces", Starter.make_valid_user_name("Very very very long name with spaces")
-    assert_equal "_nobody", Starter.make_valid_user_name("nobody")
-    assert_equal "_rvm", Starter.make_valid_user_name("rvm")
+    assert_equal "_halt", Starter.make_valid_user_name("halt")
+    assert_equal "_rubyuser", Starter.make_valid_user_name("rubyuser")
     assert_equal "staff", Starter.make_valid_user_name("staff")
     assert_equal "a", Starter.make_valid_user_name("a")
     assert_equal "_", Starter.make_valid_user_name("")
@@ -22,8 +22,8 @@ class TestStarter < Test::Unit::TestCase
   def test_make_valid_group_name
     assert_equal "mouse-click", Starter.make_valid_group_name("Mouse-Click")
     assert_equal "very_very_very_l-ame_with_spaces", Starter.make_valid_group_name("Very very very long name with spaces")
-    assert_equal "nobody", Starter.make_valid_group_name("nobody")
-    assert_equal "_rvm", Starter.make_valid_group_name("rvm")
+    assert_equal "halt", Starter.make_valid_group_name("halt")
+    assert_equal "_rubyuser", Starter.make_valid_group_name("rubyuser")
     assert_equal "_staff", Starter.make_valid_group_name("staff")
     assert_equal "a", Starter.make_valid_group_name("a")
     assert_equal "_", Starter.make_valid_group_name("")
@@ -113,7 +113,7 @@ class TestStarter < Test::Unit::TestCase
     assert(Starter.container_jrubyvm?({:rubyvm => "jruby"}))
     assert(Starter.container_jrubyvm?({:platform => "jruby"}))
     refute(Starter.container_jrubyvm?({:rubyvm => "mri"}))
-    refute(Starter.container_jrubyvm?({:platform => "x86_64-linux"}))
+    refute(Starter.container_jrubyvm?({:platform => "x86_64-linux-gnu"}))
   end
 
   def test_platforms

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc2
+  version: 1.5.0.rc1
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,10 +84,9 @@ files:
 - build/gem_helper.rb
 - build/math_h.patch
 - build/mk_i686.rb
+- build/mk_musl_cross.sh
 - build/mk_osxcross.sh
 - build/parallel_docker_build.rb
-- build/patches/ruby-2.5.9/no_sendfile.patch
-- build/patches/ruby-3.1.3/no_sendfile.patch
 - build/patches2/rake-compiler-1.2.5/0004-Enable-build-of-static-libruby.patch
 - build/rcd-env.sh
 - build/runas

data/build/patches/ruby-2.5.9/no_sendfile.patch

@@ -1,24 +0,0 @@
-diff --git a/configure b/configure
-index ebe3d8c..a336b73 100755
---- a/configure
-+++ b/configure
-@@ -18943,7 +18943,6 @@ do :
-   ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile"
- if test "x$ac_cv_func_sendfile" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_SENDFILE 1
- _ACEOF
-
- fi
-diff --git a/io.c b/io.c
-index 82c5940538..a8d3661ec8 100644
---- a/io.c
-+++ b/io.c
-@@ -10721,7 +10721,6 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
- }
-
- #if defined HAVE_COPY_FILE_RANGE || (defined __linux__ && defined __NR_copy_file_range)
--#  define USE_COPY_FILE_RANGE
- #endif
-
- #ifdef USE_COPY_FILE_RANGE

data/build/patches/ruby-3.1.3/no_sendfile.patch

@@ -1,24 +0,0 @@
-diff --git a/configure b/configure
-index ebe3d8c..a336b73 100755
---- a/configure
-+++ b/configure
-@@ -18943,7 +18943,6 @@ do :
-   ac_fn_c_check_func "$LINENO" "sendfile" "ac_cv_func_sendfile"
- if test "x$ac_cv_func_sendfile" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_SENDFILE 1
- _ACEOF
-
- fi
-diff --git a/io.c b/io.c
-index 48592ac51a..2635ac8ec6 100644
---- a/io.c
-+++ b/io.c
-@@ -11111,6 +11111,7 @@ nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
-     return 0;
- }
-
-+#undef USE_COPY_FILE_RANGE
- #ifdef USE_COPY_FILE_RANGE
-
- static ssize_t