rcee_precompiled 0.4.0 → 0.5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e95371c9254f1e4e13c647e6d9bd9a7bf58969568ca3d0423b32dd2509ddb8
-  data.tar.gz: d1d43c4c1ef4cd9b1b823cc46cc760b8b882d944cbc5cbb8d646533d8405a74a
+  metadata.gz: 294cbf26a8c178f2ce7cab0eba35b4e89cb295f833aabaacdc1c467ab888382d
+  data.tar.gz: 6d66ea9e396fe883a3c5bb77aa1e9826d5f1fe60c897dfbd7a829b55be4a0a2a
 SHA512:
-  metadata.gz: fd010aa61f60be476bab9b8ad1b0e5bf1f2d13f9fd5a4fee50906451f235e2ca015d08e40160b24d5221bd2bf4052b935a58bb1e8619eb1ba3baa5274821dafb
-  data.tar.gz: bdbb4d096318095eaadaf013e0e00b3f7fd3c7100cdec8a25c7d6e26e2ee3341964de504d2fb47563a5cf63cfb50a3fe708bdf8017c3f1658ad4ee31b5d18cd5
+  metadata.gz: c3f92d71af2605b2913b96d32a50d9925210ab715bb8ccda6bbfe65f90c1c3de76f1b3ee22ed3f4c7f4f5a227951d480af602efa4d9c0ff7087516139ade8780
+  data.tar.gz: 4433d5002a1de242c9959dd52b408c4ee9a5e3ac62d46b2d7428fc4bec8bb021e284226c8d9989a4719e2abb9beae78e1ecb5153d40598b5548b315a2838f21e

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 gem "rake", "~> 13.0"
 
-gem "rake-compiler"
-gem "rake-compiler-dock", "~> 1.2.1"
+gem "rake-compiler", "1.2.7"
+gem "rake-compiler-dock", "1.5.0.rc1"
 
 gem "minitest", "~> 5.0"

data/README.md

@@ -26,7 +26,7 @@ This is really powerful stuff, and once we assume that we can cross-compile reli
 First, we need to add some features to our `Rake::ExtensionTask` in `Rakefile`:
 
 ``` ruby
-cross_rubies = ["3.1.0", "3.0.0", "2.7.0", "2.6.0"]
+cross_rubies = ["3.3.0", "3.2.0", "3.1.0", "3.0.0"]
 cross_platforms = [
   "x64-mingw32",
   "x64-mingw-ucrt",
@@ -92,30 +92,33 @@ The top task (or, really, _set_ of tasks) runs on the host system, and invokes t
 Changes to the `extconf.rb`:
 
 ``` ruby
-ENV["CC"] = RbConfig::CONFIG["CC"]
+def configure_cross_compilers
+  RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
+  ENV["CC"] = RbConfig::CONFIG["CC"]
+end
 ```
 
 This makes sure that the cross-compiler is the compiler used within the guest container (and not the native linux compiler).
 
 ``` ruby
-cross_build_p = enable_config("cross-build")
+def cross_build?
+  enable_config("cross-build")
+end
 ```
 
 The cross-compile rake task signals to `extconf.rb` that it's cross-compiling by using a commandline flag that we can inspect. We'll need this for `libyaml` to make sure that set the appropriate flags during precompilation (flags which shouldn't be set when compiling natively).
 
 ``` ruby
-MiniPortile.new("yaml", "0.2.5").tap do |recipe|
-  # ...
-  # configure the environment that MiniPortile will use for subshells
-  ENV.to_h.dup.tap do |env|
-    # -fPIC is necessary for linking into a shared library
-    env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ")
-    env["SUBDIRS"] = "include src" # libyaml: skip tests
-
-    recipe.configure_options += env.map { |key, value| "#{key}=#{value.strip}" }
+  # pass some environment variables to the libyaml configuration for cross-compilation
+  if cross_build?
+    ENV.to_h.tap do |env|
+      # -fPIC is necessary for linking into a shared library
+      env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ")
+      env["SUBDIRS"] = "include src" # libyaml: skip tests
+
+      recipe.configure_options += env.map { |key, value| "#{key}=#{value.strip}" }
+    end
   end
-  # ...
-end
 ```
 
 The rest of the extconf changes are related to configuring libyaml at build time. We need to set the -fPIC option so we can mix static and shared libraries together. (This should probably always be set.)
@@ -128,14 +131,14 @@ We have one more small change we'll need to make to how the extension is require
 lib
 └── rcee
     ├── precompiled
-    │   ├── 2.6
-    │   │   └── precompiled.so
-    │   ├── 2.7
-    │   │   └── precompiled.so
     │   ├── 3.0
     │   │   └── precompiled.so
     │   ├── 3.1
     │   │   └── precompiled.so
+    │   ├── 3.2
+    │   │   └── precompiled.so
+    │   ├── 3.3
+    │   │   └── precompiled.so
     │   └── version.rb
     └── precompiled.rb
 ```

data/Rakefile

@@ -6,22 +6,26 @@ require "rake/testtask"
 require "rake/extensiontask"
 require "rake_compiler_dock"
 
-cross_rubies = ["3.1.0", "3.0.0", "2.7.0", "2.6.0"]
+cross_rubies = ["3.3.0", "3.2.0", "3.1.0", "3.0.0"]
 cross_platforms = [
   "aarch64-linux",
+  "aarch64-linux-musl",
   "arm-linux",
+  "arm-linux-musl",
   "arm64-darwin",
   "x64-mingw-ucrt",
   "x64-mingw32",
   "x86-linux",
+  "x86-linux-musl",
   "x86_64-darwin",
   "x86_64-linux",
+  "x86_64-linux-musl",
 ]
 ENV["RUBY_CC_VERSION"] = cross_rubies.join(":")
 
 rcee_precompiled_spec = Bundler.load_gemspec("rcee_precompiled.gemspec")
 Gem::PackageTask.new(rcee_precompiled_spec).define #packaged_tarball version of the gem for platform=ruby
-task "package" => cross_platforms.map { |p| "gem:#{p}" } # "package" task for all the native platforms
+task "package" => "gem:all"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/ext/precompiled/extconf.rb

@@ -1,41 +1,78 @@
 require "mkmf"
 require "mini_portile2"
 
-package_root_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+module RCEE
+  module Precompiled
+    module ExtConf
+      PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 
-RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
-ENV["CC"] = RbConfig::CONFIG["CC"]
+      class << self
+        def configure
+          configure_cross_compilers
+          configure_packaged_libraries
+          create_makefile("rcee/precompiled/precompiled")
+        end
 
-cross_build_p = enable_config("cross-build")
+        def configure_cross_compilers
+          RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
+          ENV["CC"] = RbConfig::CONFIG["CC"]
+        end
 
-MiniPortile.new("yaml", "0.2.5").tap do |recipe|
-  recipe.files = [{
-    url: "https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz",
-    sha256: "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4",
-  }]
-  recipe.target = File.join(package_root_dir, "ports")
+        def configure_packaged_libraries
+          recipe = libyaml_recipe
 
-  # configure the environment that MiniPortile will use for subshells
-  if cross_build_p
-    ENV.to_h.tap do |env|
-      # -fPIC is necessary for linking into a shared library
-      env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ")
-      env["SUBDIRS"] = "include src" # libyaml: skip tests
+          # pass some environment variables to the libyaml configuration for cross-compilation
+          if cross_build?
+            ENV.to_h.tap do |env|
+              # -fPIC is necessary for linking into a shared library
+              env["CFLAGS"] = [env["CFLAGS"], "-fPIC"].join(" ")
+              env["SUBDIRS"] = "include src" # libyaml: skip tests
 
-      recipe.configure_options += env.map { |key, value| "#{key}=#{value.strip}" }
-    end
-  end
+              recipe.configure_options += env.map { |key, value| "#{key}=#{value.strip}" }
+            end
+          end
 
-  unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))
-    recipe.cook
-  end
+          # ensure libyaml has already been unpacked, configured, and compiled
+          unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))
+            recipe.cook
+          end
+
+          # use the packaged libyaml
+          recipe.activate
+          pkg_config(File.join(recipe.path, "lib", "pkgconfig", "yaml-0.1.pc"))
+
+          # assert that we can build against the packaged libyaml
+          unless have_library("yaml", "yaml_get_version", "yaml.h")
+            abort("\nERROR: *** could not find libyaml development environment ***\n\n")
+          end
+        end
 
-  recipe.activate
-  pkg_config(File.join(recipe.path, "lib", "pkgconfig", "yaml-0.1.pc"))
+        def cross_build?
+          enable_config("cross-build")
+        end
+
+        def download
+          libyaml_recipe.download
+        end
+
+        def libyaml_recipe
+          MiniPortile.new("yaml", "0.2.5").tap do |recipe|
+            recipe.files = [{
+              url: "https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz",
+              sha256: "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4"
+            }]
+            recipe.target = File.join(PACKAGE_ROOT_DIR, "ports")
+          end
+        end
+      end
+    end
+  end
 end
 
-unless have_library("yaml", "yaml_get_version", "yaml.h")
-  abort("\nERROR: *** could not find libyaml development environment ***\n\n")
+# run "ruby ./ext/precompiled/extconf.rb -- --download-dependencies" to download the tarball
+if arg_config("--download-dependencies")
+  RCEE::Precompiled::ExtConf.download
+  exit!(0)
 end
 
-create_makefile("rcee/precompiled/precompiled")
+RCEE::Precompiled::ExtConf.configure

data/lib/rcee/precompiled/version.rb

@@ -2,6 +2,6 @@
 
 module RCEE
   module Precompiled
-    VERSION = "0.4.0"
+    VERSION = "0.5.0.1"
   end
 end

data/rcee_precompiled.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Example gem demonstrating a basic C extension."
   spec.description   = "Part of a project to explain how Ruby C extensions work."
   spec.homepage      = "https://github.com/flavorjones/ruby-c-extensions-explained"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 3.0.0"
   spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcee_precompiled
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.1
 platform: ruby
 authors:
 - Mike Dalessio
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -24,6 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  force_ruby_platform: false
 description: Part of a project to explain how Ruby C extensions work.
 email:
 - mike.dalessio@gmail.com
@@ -47,7 +48,7 @@ homepage: https://github.com/flavorjones/ruby-c-extensions-explained
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -55,15 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Example gem demonstrating a basic C extension.
 test_files: []