mini_portile2 2.8.3 → 2.8.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51973caa0015d6919e11d6e081cec2e26f146cf329e5f2ec9b34b97e1485d13a
-  data.tar.gz: e5a8eeb01caa0e047ba7d0c75e19e726b18aa8af4fa6fc89e40367671d8bc919
+  metadata.gz: 235fc41ae2e4aab6133eb8edb741bb535194af46c1aca4e70f0785d2c1253322
+  data.tar.gz: 4ffdc351e59c3cec669361e0fb7b50b536d113363a7ed1c91d8fb681453df4fa
 SHA512:
-  metadata.gz: 7711d008192576bddd38a396a372581cfff4e6e2ec48c95ac669c61db470bad9a9e508cf314ab6fa859069477262c1c8c7d30beb043d3ce6a571c80351ef0e79
-  data.tar.gz: 553bc5519d22489492ee5eb16c80048731523a1cf45e8f7eb3c2f5a29de9b0a61bfa350894cbd0a82a769c6972ddd1083deb379b262f53ea9092a6e4abb910cd
+  metadata.gz: 03deed0dd932686706f7956fda4f167fb46c73f87f443c058163226019de21d16252c509b453fccfaa8b661bf3f9667b0c1f2fec66edcef042a968fcd847811f
+  data.tar.gz: a5d574f3b181ed8303ae0c799e6092fde2166fd1dc5937961f7b8016eef441a287cf80c4abf1bb2ec0f036894a12ea80f12edb30cec631981f6d8f042ad87959

data/.github/workflows/ci.yml

@@ -67,5 +67,22 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: examples/ports/archives
-          key: ${{ matrix.platform }}-examples-${{ hashFiles('examples/Rakefile') }}
+          key: examples-${{ hashFiles('examples/Rakefile') }}
+      - run: bundle exec rake test:examples
+
+  fedora: # see https://github.com/flavorjones/mini_portile/issues/118
+    runs-on: ubuntu-latest
+    container:
+      image: fedora:35
+    steps:
+      - run: |
+          dnf group install -y "C Development Tools and Libraries"
+          dnf install -y ruby ruby-devel libyaml-devel git-all patch cmake xz
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: examples/ports/archives
+          key: examples-${{ hashFiles('examples/Rakefile') }}
+      - run: bundle install
+      - run: bundle exec rake test:unit
       - run: bundle exec rake test:examples

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 pkg
 ports
 tmp
+mkmf.log

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## mini_portile changelog
 
+### 2.8.5.rc1 / 2023-09-13
+
+#### Added
+
+- New method `MiniPortile#mkmf_config` will set up MakeMakefile variables to properly link against the recipe. This should make it easier for C extensions to package third-party libraries.
+  - With no arguments, will set up just `$INCFLAGS`, `$libs`, and `$LIBPATH`.
+  - Optionally, if provided a pkg-config file, will use that config to more precisely set `$INCFLAGS`, `$libs`, `$LIBPATH`, and `$CFLAGS`/`$CXXFLAGS`.
+
+
+### 2.8.4 / 2023-07-18
+
+- cmake: set CMAKE compile flags to configure cross-compilation similarly to `autotools` `--host` flag: `SYSTEM_NAME`, `SYSTEM_PROCESSOR`, `C_COMPILER`, and `CXX_COMPILER`. [#130] (Thanks, @stanhu!)
+
+
 ### 2.8.3 / 2023-07-18
 
 #### Fixed

data/lib/mini_portile2/mini_portile.rb

@@ -35,17 +35,63 @@ class MiniPortile
   attr_accessor :host, :files, :patch_files, :target, :logger, :source_directory
 
   def self.windows?
-    RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
+    target_os =~ /mswin|mingw/
   end
 
   # GNU MinGW compiled Ruby?
   def self.mingw?
-    RbConfig::CONFIG['target_os'] =~ /mingw/
+    target_os =~ /mingw/
   end
 
   # MS Visual-C compiled Ruby?
   def self.mswin?
-    RbConfig::CONFIG['target_os'] =~ /mswin/
+    target_os =~ /mswin/
+  end
+
+  def self.darwin?
+    target_os =~ /darwin/
+  end
+
+  def self.freebsd?
+    target_os =~ /freebsd/
+  end
+
+  def self.openbsd?
+    target_os =~ /openbsd/
+  end
+
+  def self.linux?
+    target_os =~ /linux/
+  end
+
+  def self.solaris?
+    target_os =~ /solaris/
+  end
+
+  def self.target_os
+    RbConfig::CONFIG['target_os']
+  end
+
+  def self.target_cpu
+    RbConfig::CONFIG['target_cpu']
+  end
+
+  def self.native_path(path)
+    path = File.expand_path(path)
+    if File::ALT_SEPARATOR
+      path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+    else
+      path
+    end
+  end
+
+  def self.posix_path(path)
+    path = File.expand_path(path)
+    if File::ALT_SEPARATOR
+      "/" + path.tr(File::ALT_SEPARATOR, File::SEPARATOR).tr(":", File::SEPARATOR)
+    else
+      path
+    end
   end
 
   def initialize(name, version, **kwargs)
@@ -58,12 +104,12 @@ class MiniPortile
     @logger = STDOUT
     @source_directory = nil
 
-    @original_host = @host = detect_host
-
     @gcc_command = kwargs[:gcc_command]
     @make_command = kwargs[:make_command]
     @open_timeout = kwargs[:open_timeout] || DEFAULT_TIMEOUT
     @read_timeout = kwargs[:read_timeout] || DEFAULT_TIMEOUT
+
+    @original_host = @host = detect_host
   end
 
   def source_directory=(path)
@@ -212,7 +258,7 @@ class MiniPortile
 
     # rely on LDFLAGS when cross-compiling
     if File.exist?(lib_path) && (@host != @original_host)
-      full_path = File.expand_path(lib_path)
+      full_path = native_path(lib_path)
 
       old_value = ENV.fetch("LDFLAGS", "")
 
@@ -222,6 +268,58 @@ class MiniPortile
     end
   end
 
+  def mkmf_config(pkg: nil, dir: nil)
+    require "mkmf"
+
+    if pkg
+      dir ||= File.join(path, "lib", "pkgconfig")
+      pcfile = File.join(dir, "#{pkg}.pc")
+      unless File.exist?(pcfile)
+        raise ArgumentError, "pkg-config file '#{pcfile}' does not exist"
+      end
+
+      output "Configuring MakeMakefile for #{File.basename(pcfile)} (in #{File.dirname(pcfile)})\n"
+
+      # on macos, pkg-config will not return --cflags without this
+      ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
+
+      # append to PKG_CONFIG_PATH as we go, so later pkg-config files can depend on earlier ones
+      ENV["PKG_CONFIG_PATH"] = [ENV["PKG_CONFIG_PATH"], dir].compact.join(File::PATH_SEPARATOR)
+
+      incflags = minimal_pkg_config(pcfile, "cflags-only-I")
+      cflags = minimal_pkg_config(pcfile, "cflags-only-other")
+      ldflags = minimal_pkg_config(pcfile, "libs-only-L", "static")
+      libflags = minimal_pkg_config(pcfile, "libs-only-l", "static")
+    else
+      output "Configuring MakeMakefile for #{@name} #{@version} (from #{path})\n"
+
+      include_path = File.join(path, "include")
+      lib_path = File.join(path, "lib")
+
+      lib_name = name.sub(/\Alib/, "") # TODO: use delete_prefix when we no longer support ruby 2.4
+
+      incflags = "-I#{include_path}" if Dir.exist?(include_path)
+      ldflags = "-L#{lib_path}" if Dir.exist?(lib_path)
+      libflags = "-l#{lib_name}" if Dir.exist?(lib_path)
+    end
+
+    if ldflags
+      libpaths = ldflags.split.map { |f| f.sub(/\A-L/, "") }
+    end
+
+    # prefer this package by prepending directories to the search path
+    #
+    # use $LIBPATH instead of $LDFLAGS to ensure we get the `-Wl,-rpath` linker flag for re-finding
+    # shared libraries
+    $INCFLAGS = [incflags, $INCFLAGS].join(" ").strip if incflags
+    $LIBPATH = libpaths | $LIBPATH if libpaths
+
+    # prefer this package's flags by appending them to the command line
+    $CFLAGS = [$CFLAGS, cflags].join(" ").strip if cflags
+    $CXXFLAGS = [$CXXFLAGS, cflags].join(" ").strip if cflags
+    $libs = [$libs, libflags].join(" ").strip if libflags
+  end
+
   def path
     File.expand_path(port_path)
   end
@@ -237,21 +335,11 @@ class MiniPortile
   private
 
   def native_path(path)
-    path = File.expand_path(path)
-    if File::ALT_SEPARATOR
-      path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
-    else
-      path
-    end
+    MiniPortile.native_path(path)
   end
 
   def posix_path(path)
-    path = File.expand_path(path)
-    if File::ALT_SEPARATOR
-      "/" + path.tr(File::ALT_SEPARATOR, File::SEPARATOR).tr(":", File::SEPARATOR)
-    else
-      path
-    end
+    MiniPortile.posix_path(path)
   end
 
   def tmp_path
@@ -620,4 +708,29 @@ class MiniPortile
     FileUtils.mkdir_p File.dirname(full_path)
     FileUtils.mv temp_file.path, full_path, :force => true
   end
+
+  #
+  #  this minimal version of pkg_config is based on ruby 29dc9378 (2023-01-09)
+  #
+  #  specifically with the fix from b90e56e6 to support multiple pkg-config options, and removing
+  #  code paths that aren't helpful for mini-portile's use case of parsing pc files.
+  #
+  def minimal_pkg_config(pkg, *pcoptions)
+    if pcoptions.empty?
+      raise ArgumentError, "no pkg-config options are given"
+    end
+
+    if ($PKGCONFIG ||=
+        (pkgconfig = MakeMakefile.with_config("pkg-config") {MakeMakefile.config_string("PKG_CONFIG") || "pkg-config"}) &&
+        MakeMakefile.find_executable0(pkgconfig) && pkgconfig)
+      pkgconfig = $PKGCONFIG
+    else
+      raise RuntimeError, "pkg-config is not found"
+    end
+
+    pcoptions = Array(pcoptions).map { |o| "--#{o}" }
+    response = IO.popen([pkgconfig, *pcoptions, pkg], err:[:child, :out], &:read)
+    raise RuntimeError, response unless $?.success?
+    response.strip
+  end
 end

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -2,6 +2,8 @@ require 'mini_portile2/mini_portile'
 require 'open3'
 
 class MiniPortileCMake < MiniPortile
+  attr_accessor :system_name
+
   def configure_prefix
     "-DCMAKE_INSTALL_PREFIX=#{File.expand_path(port_path)}"
   end
@@ -12,13 +14,10 @@ class MiniPortileCMake < MiniPortile
   end
 
   def configure_defaults
-    if MiniPortile.mswin? && generator_available?('NMake')
-      ['-G', 'NMake Makefiles']
-    elsif MiniPortile.mingw? && generator_available?('MSYS')
-      ['-G', 'MSYS Makefiles']
-    else
-      []
-    end
+    [
+      generator_defaults,
+      cmake_compile_flags,
+    ].flatten
   end
 
   def configure
@@ -52,6 +51,77 @@ class MiniPortileCMake < MiniPortile
 
   private
 
+  def generator_defaults
+    if MiniPortile.mswin? && generator_available?('NMake')
+      ['-G', 'NMake Makefiles']
+    elsif MiniPortile.mingw? && generator_available?('MSYS')
+      ['-G', 'MSYS Makefiles']
+    else
+      []
+    end
+  end
+
+  def cmake_compile_flags
+    c_compiler, cxx_compiler = find_c_and_cxx_compilers(host)
+
+    # needed to ensure cross-compilation with CMake targets the right CPU and compilers
+    [
+      "-DCMAKE_SYSTEM_NAME=#{cmake_system_name}",
+      "-DCMAKE_SYSTEM_PROCESSOR=#{cpu_type}",
+      "-DCMAKE_C_COMPILER=#{c_compiler}",
+      "-DCMAKE_CXX_COMPILER=#{cxx_compiler}"
+    ]
+  end
+
+  def find_compiler(compilers)
+    compilers.find { |binary| which(binary) }
+  end
+
+  # configure automatically searches for the right compiler based on the
+  # `--host` parameter.  However, CMake doesn't have an equivalent feature.
+  # Search for the right compiler for the target architecture using
+  # some basic heruistics.
+  def find_c_and_cxx_compilers(host)
+    c_compiler = ENV["CC"]
+    cxx_compiler = ENV["CXX"]
+
+    if MiniPortile.darwin?
+      c_compiler ||= 'clang'
+      cxx_compiler ||='clang++'
+    else
+      c_compiler ||= 'gcc'
+      cxx_compiler ||= 'g++'
+    end
+
+    c_platform_compiler = "#{host}-#{c_compiler}"
+    cxx_platform_compiler = "#{host}-#{cxx_compiler}"
+    c_compiler = find_compiler([c_platform_compiler, c_compiler])
+    cxx_compiler = find_compiler([cxx_platform_compiler, cxx_compiler])
+
+    [c_compiler, cxx_compiler]
+  end
+
+  # Full list: https://gitlab.kitware.com/cmake/cmake/-/blob/v3.26.4/Modules/CMakeDetermineSystem.cmake?ref_type=tags#L12-31
+  def cmake_system_name
+    return system_name if system_name
+
+    if MiniPortile.linux?
+      'Linux'
+    elsif MiniPortile.darwin?
+      'Darwin'
+    elsif MiniPortile.windows?
+      'Windows'
+    elsif MiniPortile.freebsd?
+      'FreeBSD'
+    elsif MiniPortile.openbsd?
+      'OpenBSD'
+    elsif MiniPortile.solaris?
+      'SunOS'
+    else
+      raise "Unable to set CMAKE_SYSTEM_NAME for #{MiniPortile.target_os}"
+    end
+  end
+
   def generator_available?(generator_type)
     stdout_str, status = Open3.capture2("#{cmake_cmd} --help")
 
@@ -59,4 +129,10 @@ class MiniPortileCMake < MiniPortile
 
     stdout_str.include?("#{generator_type} Makefiles")
   end
+
+  def cpu_type
+    return 'x86_64' if MiniPortile.target_cpu == 'x64'
+
+    MiniPortile.target_cpu
+  end
 end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.8.3"
+  VERSION = "2.8.5.rc1"
 end

data/test/assets/pkgconf/libxml2/libxml-2.0.pc

@@ -0,0 +1,13 @@
+prefix=/foo/libxml2/2.11.5
+exec_prefix=${prefix}
+libdir=/foo/libxml2/2.11.5/lib
+includedir=${prefix}/include
+modules=1
+
+Name: libXML
+Version: 2.11.5
+Description: libXML library version2.
+Requires:
+Libs: -L${libdir} -lxml2
+Libs.private: -L/foo/zlib/1.3/lib -lz     -lm  
+Cflags: -I${includedir}/libxml2 -ggdb3

data/test/assets/pkgconf/libxslt/libexslt.pc

@@ -0,0 +1,13 @@
+prefix=/foo/libxslt/1.1.38
+exec_prefix=${prefix}
+libdir=/foo/libxslt/1.1.38/lib
+includedir=${prefix}/include
+
+
+Name: libexslt
+Version: 0.8.21
+Description: EXSLT Extension library
+Requires: libxml-2.0, libxslt
+Cflags: -I${includedir}
+Libs: -L${libdir} -lexslt
+Libs.private: -lm 

data/test/assets/pkgconf/libxslt/libxslt.pc

@@ -0,0 +1,13 @@
+prefix=/foo/libxslt/1.1.38
+exec_prefix=${prefix}
+libdir=/foo/libxslt/1.1.38/lib
+includedir=${prefix}/include
+
+
+Name: libxslt
+Version: 1.1.38
+Description: XSLT library version 2.
+Requires: libxml-2.0
+Cflags: -I${includedir} -Wno-deprecated-enum-enum-conversion
+Libs: -L${libdir} -lxslt
+Libs.private: -lm

data/test/test_activate.rb

@@ -0,0 +1,139 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestActivate < TestCase
+  attr_reader :recipe
+
+  def setup
+    super
+
+    @save_env = %w[PATH CPATH LIBRARY_PATH LDFLAGS].inject({}) do |env, var|
+      env.update(var => ENV[var])
+    end
+
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    @recipe = MiniPortile.new("foo", "1.0.0").tap do |recipe|
+      recipe.logger = StringIO.new
+    end
+  end
+
+  def teardown
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    @save_env.each do |var, val|
+      ENV[var] = val
+    end
+
+    super
+  end
+
+  def test_PATH_env_var_when_bin_does_not_exist
+    ENV["PATH"] = "foo"
+    refute(Dir.exist?(bin_path))
+    refute_includes(path_elements('PATH'), bin_path)
+
+    recipe.activate
+
+    refute_includes(path_elements('PATH'), bin_path)
+  end
+
+  def test_PATH_env_var_when_bin_exists
+    ENV["PATH"] = "foo"
+    FileUtils.mkdir_p(bin_path)
+    refute_includes(path_elements('PATH'), bin_path)
+
+    recipe.activate
+
+    assert_includes(path_elements('PATH'), bin_path)
+    assert_equal(path_elements('PATH').first, bin_path)
+  end
+
+  def test_CPATH_env_var_when_include_does_not_exist
+    ENV["CPATH"] = "foo"
+    refute(Dir.exist?(include_path))
+    refute_includes(path_elements('CPATH'), include_path)
+
+    recipe.activate
+
+    refute_includes(path_elements('CPATH'), include_path)
+  end
+
+  def test_CPATH_env_var_when_include_exists
+    ENV["CPATH"] = "foo"
+    FileUtils.mkdir_p(include_path)
+    refute_includes(path_elements('CPATH'), include_path)
+
+    recipe.activate
+
+    assert_includes(path_elements('CPATH'), include_path)
+    assert_equal(path_elements('CPATH').first, include_path)
+  end
+
+  def test_LIBRARY_PATH_env_var_when_lib_does_not_exist
+    ENV["LIBRARY_PATH"] = "foo"
+    refute(Dir.exist?(lib_path))
+    refute_includes(path_elements('LIBRARY_PATH'), lib_path)
+
+    recipe.activate
+
+    refute_includes(path_elements('LIBRARY_PATH'), lib_path)
+  end
+
+  def test_LIBRARY_PATH_env_var_when_lib_exists
+    ENV["LIBRARY_PATH"] = "foo"
+    FileUtils.mkdir_p(lib_path)
+    refute_includes(path_elements('LIBRARY_PATH'), lib_path)
+
+    recipe.activate
+
+    assert_includes(path_elements('LIBRARY_PATH'), lib_path)
+    assert_equal(path_elements('LIBRARY_PATH').first, lib_path)
+  end
+
+  def test_LDFLAGS_env_var_when_not_cross_compiling
+    ENV["LDFLAGS"] = "-lfoo"
+    FileUtils.mkdir_p(lib_path)
+    assert_equal(recipe.host, recipe.original_host) # assert on setup)
+
+    refute_includes(flag_elements('LDFLAGS'), "-L#{lib_path}")
+
+    recipe.activate
+
+    refute_includes(flag_elements('LDFLAGS'), "-L#{lib_path}")
+  end
+
+  def test_LDFLAGS_env_var_when_cross_compiling
+    ENV["LDFLAGS"] = "-lfoo"
+    recipe.host = recipe.original_host + "-x" # make them not-equal
+    FileUtils.mkdir_p(lib_path)
+
+    refute_includes(flag_elements('LDFLAGS'), "-L#{lib_path}")
+
+    recipe.activate
+
+    assert_includes(flag_elements('LDFLAGS'), "-L#{lib_path}")
+    assert_equal(flag_elements('LDFLAGS').first, "-L#{lib_path}")
+  end
+
+  private
+
+  def path_elements(varname)
+    ENV.fetch(varname, "").split(File::PATH_SEPARATOR)
+  end
+
+  def flag_elements(varname)
+    ENV.fetch(varname, "").split
+  end
+
+  def bin_path
+    MiniPortile.native_path(File.join(recipe.path, "bin"))
+  end
+
+  def include_path
+    MiniPortile.native_path(File.join(recipe.path, "include"))
+  end
+
+  def lib_path
+    MiniPortile.native_path(File.join(recipe.path, "lib"))
+  end
+end

data/test/test_cmake.rb

@@ -14,13 +14,11 @@ class TestCMake < TestCase
     create_tar(@tar_path, @assets_path, "test-cmake-1.0")
     start_webrick(File.dirname(@tar_path))
 
-    @recipe = MiniPortileCMake.new("test-cmake", "1.0").tap do |recipe|
-      recipe.files << "http://localhost:#{HTTP_PORT}/#{ERB::Util.url_encode(File.basename(@tar_path))}"
-      recipe.patch_files << File.join(@assets_path, "patch 1.diff")
-      git_dir = File.join(@assets_path, "git")
-      with_custom_git_dir(git_dir) do
-        recipe.cook
-      end
+    @recipe = init_recipe
+
+    git_dir = File.join(@assets_path, "git")
+    with_custom_git_dir(git_dir) do
+      recipe.cook
     end
   end
 
@@ -57,6 +55,13 @@ class TestCMake < TestCase
     binary = File.join(recipe.path, "bin", exe_name)
     assert File.exist?(binary), binary
   end
+
+  def init_recipe
+    MiniPortileCMake.new("test-cmake", "1.0").tap do |recipe|
+      recipe.files << "http://localhost:#{HTTP_PORT}/#{ERB::Util.url_encode(File.basename(@tar_path))}"
+      recipe.patch_files << File.join(@assets_path, "patch 1.diff")
+    end
+  end
 end
 
 class TestCMakeConfig < TestCMake
@@ -77,26 +82,103 @@ class TestCMakeConfig < TestCMake
     end
   end
 
+  def test_configure_defaults_with_macos
+    recipe = init_recipe
+    recipe.host = 'some-host'
+
+    with_env({ "CC" => nil, "CXX" => nil }) do
+      MiniPortile.stub(:darwin?, true) do
+        with_stubbed_target(os: 'darwin22', cpu: 'arm64') do
+          with_compilers(recipe, host_prefix: true, c_compiler: 'clang', cxx_compiler: 'clang++') do
+            Open3.stub(:capture2, cmake_help_mock('Unix')) do
+              assert_equal(
+                [
+                  "-DCMAKE_SYSTEM_NAME=Darwin",
+                  "-DCMAKE_SYSTEM_PROCESSOR=arm64",
+                  "-DCMAKE_C_COMPILER=some-host-clang",
+                  "-DCMAKE_CXX_COMPILER=some-host-clang++"
+                ],
+                recipe.configure_defaults)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def test_configure_defaults_with_manual_system_name
+    recipe = init_recipe
+    recipe.system_name = 'Custom'
+
+    MiniPortile.stub(:darwin?, false) do
+      with_stubbed_target do
+        with_compilers(recipe) do
+          Open3.stub(:capture2, cmake_help_mock('Unix')) do
+            assert_equal(
+              [
+                "-DCMAKE_SYSTEM_NAME=Custom",
+                "-DCMAKE_SYSTEM_PROCESSOR=x86_64",
+                "-DCMAKE_C_COMPILER=gcc",
+                "-DCMAKE_CXX_COMPILER=g++"
+              ],
+              recipe.configure_defaults)
+          end
+        end
+      end
+    end
+  end
+
   def test_configure_defaults_with_unix_makefiles
-    Open3.stub(:capture2, cmake_help_mock('Unix')) do
-      MiniPortile.stub(:mingw?, true) do
-        assert_equal([], @recipe.configure_defaults)
+    recipe = init_recipe
+
+    MiniPortile.stub(:linux?, true) do
+      MiniPortile.stub(:darwin?, false) do
+        with_stubbed_target do
+          with_compilers(recipe) do
+            Open3.stub(:capture2, cmake_help_mock('Unix')) do
+              MiniPortile.stub(:mingw?, true) do
+                assert_equal(default_x86_compile_flags,
+                            recipe.configure_defaults)
+              end
+            end
+          end
+        end
       end
     end
   end
 
   def test_configure_defaults_with_msys_makefiles
-    Open3.stub(:capture2, cmake_help_mock('MSYS')) do
-      MiniPortile.stub(:mingw?, true) do
-        assert_equal(['-G', 'MSYS Makefiles'], @recipe.configure_defaults)
+    recipe = init_recipe
+
+    MiniPortile.stub(:linux?, true) do
+      MiniPortile.stub(:darwin?, false) do
+        with_stubbed_target do
+          with_compilers(recipe) do
+            Open3.stub(:capture2, cmake_help_mock('MSYS')) do
+              MiniPortile.stub(:mingw?, true) do
+                assert_equal(['-G', 'MSYS Makefiles'] + default_x86_compile_flags, recipe.configure_defaults)
+              end
+            end
+          end
+        end
       end
     end
   end
 
   def test_configure_defaults_with_nmake_makefiles
-    Open3.stub(:capture2, cmake_help_mock('NMake')) do
-      MiniPortile.stub(:mswin?, true) do
-        assert_equal(['-G', 'NMake Makefiles'], @recipe.configure_defaults)
+    recipe = init_recipe
+
+    MiniPortile.stub(:linux?, true) do
+      MiniPortile.stub(:darwin?, false) do
+        with_stubbed_target do
+          with_compilers(recipe) do
+            Open3.stub(:capture2, cmake_help_mock('NMake')) do
+              MiniPortile.stub(:mswin?, true) do
+                assert_equal(['-G', 'NMake Makefiles'] + default_x86_compile_flags, recipe.configure_defaults)
+              end
+            end
+          end
+        end
       end
     end
   end
@@ -114,12 +196,47 @@ class TestCMakeConfig < TestCMake
 
   private
 
+  def with_stubbed_target(os: 'linux', cpu: 'x86_64')
+    MiniPortile.stub(:target_os, os) do
+      MiniPortile.stub(:target_cpu, cpu) do
+        yield
+      end
+    end
+  end
+
+  def with_compilers(recipe, host_prefix: false, c_compiler: 'gcc', cxx_compiler: 'g++')
+    mock = MiniTest::Mock.new
+
+    if host_prefix
+      mock.expect(:call, true, ["#{recipe.host}-#{c_compiler}"])
+      mock.expect(:call, true, ["#{recipe.host}-#{cxx_compiler}"])
+    else
+      mock.expect(:call, false, ["#{recipe.host}-#{c_compiler}"])
+      mock.expect(:call, true, [c_compiler])
+      mock.expect(:call, false, ["#{recipe.host}-#{cxx_compiler}"])
+      mock.expect(:call, true, [cxx_compiler])
+    end
+
+    recipe.stub(:which, mock) do
+      yield
+    end
+  end
+
+  def default_x86_compile_flags
+    [
+      "-DCMAKE_SYSTEM_NAME=Linux",
+      "-DCMAKE_SYSTEM_PROCESSOR=x86_64",
+      "-DCMAKE_C_COMPILER=gcc",
+      "-DCMAKE_CXX_COMPILER=g++"
+    ]
+  end
+
   def cmake_help_mock(generator_type)
     open3_mock = MiniTest::Mock.new
     cmake_script = <<~SCRIPT
-    echo "The following generators are available on this platform (* marks default):"
-    echo "* #{generator_type} Makefiles               = Generates standard #{generator_type.upcase} makefiles."
-  SCRIPT
+      echo "The following generators are available on this platform (* marks default):"
+      echo "* #{generator_type} Makefiles               = Generates standard #{generator_type.upcase} makefiles."
+    SCRIPT
 
     exit_status = MiniTest::Mock.new
     exit_status.expect(:success?, true)

data/test/test_mkmf_config.rb

@@ -0,0 +1,159 @@
+require File.expand_path('../helper', __FILE__)
+
+require "mkmf" # initialize $LDFLAGS et al here, instead of in the middle of a test
+
+class TestMkmfConfig < TestCase
+  attr_reader :recipe, :include_path, :lib_path
+
+  LIBXML_PCP = File.join(__dir__, "assets", "pkgconf", "libxml2")
+  LIBXSLT_PCP = File.join(__dir__, "assets", "pkgconf", "libxslt")
+
+  def setup
+    super
+
+    @save_env = %w[PATH CPATH LIBRARY_PATH LDFLAGS PKG_CONFIG_PATH].inject({}) do |env, var|
+      env.update(var => ENV[var])
+    end
+    $INCFLAGS = "-I/xxx"
+    $LIBPATH = ["xxx"]
+    $CFLAGS = "-xxx"
+    $CXXFLAGS = "-xxx"
+    $libs = "-lxxx"
+
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    @recipe = MiniPortile.new("libfoo", "1.0.0").tap do |recipe|
+      recipe.logger = StringIO.new
+    end
+    @include_path = File.join(@recipe.path, "include")
+    @lib_path = File.join(@recipe.path, "lib")
+  end
+
+  def teardown
+    FileUtils.rm_rf(["tmp", "ports"]) # remove any previous test files
+
+    $INCFLAGS = ""
+    $LIBPATH = []
+    $CFLAGS = ""
+    $CXXFLAGS = ""
+    $libs = ""
+    @save_env.each do |var, val|
+      ENV[var] = val
+    end
+
+    super
+  end
+
+  def test_mkmf_config_recipe_LIBPATH_global_lib_dir_does_not_exist
+    recipe.mkmf_config
+
+    refute_includes($LIBPATH, lib_path)
+    refute_includes($libs.split, "-lfoo")
+  end
+
+  def test_mkmf_config_recipe_LIBPATH_global
+    FileUtils.mkdir_p(lib_path)
+
+    recipe.mkmf_config
+
+    assert_includes($LIBPATH, lib_path)
+    assert_operator($LIBPATH.index(lib_path), :<, $LIBPATH.index("xxx")) # prepend
+
+    assert_includes($libs.split, "-lfoo") # note the recipe name is "libfoo"
+    assert_match(%r{-lxxx.*-lfoo}, $libs) # append
+  end
+
+  def test_mkmf_config_recipe_INCFLAGS_global_include_dir_does_not_exist
+    recipe.mkmf_config
+
+    refute_includes($INCFLAGS.split, "-I#{include_path}")
+  end
+
+  def test_mkmf_config_recipe_INCFLAGS_global
+    FileUtils.mkdir_p(include_path)
+
+    recipe.mkmf_config
+
+    assert_includes($INCFLAGS.split, "-I#{include_path}")
+    assert_match(%r{-I#{include_path}.*-I/xxx}, $INCFLAGS) # prepend
+  end
+
+  def test_mkmf_config_pkgconf_does_not_exist
+    assert_raises(ArgumentError) do
+      recipe.mkmf_config(pkg: "foo")
+    end
+  end
+
+  def test_mkmf_config_pkgconf_LIBPATH_global
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP)
+
+    assert_includes($LIBPATH, "/foo/libxml2/2.11.5/lib")
+    assert_operator($LIBPATH.index("/foo/libxml2/2.11.5/lib"), :<, $LIBPATH.index("xxx")) # prepend
+
+    assert_includes($libs.split, "-lxml2")
+    assert_match(%r{-lxxx.*-lxml2}, $libs) # append
+  end
+
+  def test_mkmf_config_pkgconf_CFLAGS_global
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP)
+
+    assert_includes($INCFLAGS.split, "-I/foo/libxml2/2.11.5/include/libxml2")
+    assert_match(%r{-I/foo/libxml2/2.11.5/include/libxml2.*-I/xxx}, $INCFLAGS) # prepend
+
+    assert_includes($CFLAGS.split, "-ggdb3")
+    assert_match(%r{-xxx.*-ggdb3}, $CFLAGS) # prepend
+
+    assert_includes($CXXFLAGS.split, "-ggdb3")
+    assert_match(%r{-xxx.*-ggdb3}, $CXXFLAGS) # prepend
+  end
+
+  def test_mkmf_config_pkgconf_path_accumulation
+    # can't get the pkgconf utility to install on windows with ruby 2.3 in CI
+    skip if MiniPortile.windows? && RUBY_VERSION < "2.4"
+
+    (ENV["PKG_CONFIG_PATH"] || "").split(File::PATH_SEPARATOR).tap do |pcpaths|
+      refute_includes(pcpaths, LIBXML_PCP)
+      refute_includes(pcpaths, LIBXSLT_PCP)
+    end
+
+    recipe.mkmf_config(pkg: "libxml-2.0", dir: LIBXML_PCP)
+
+    ENV["PKG_CONFIG_PATH"].split(File::PATH_SEPARATOR).tap do |pcpaths|
+      assert_includes(pcpaths, LIBXML_PCP)
+      refute_includes(pcpaths, LIBXSLT_PCP)
+    end
+
+    recipe.mkmf_config(pkg: "libxslt", dir: LIBXSLT_PCP)
+
+    ENV["PKG_CONFIG_PATH"].split(File::PATH_SEPARATOR).tap do |pcpaths|
+      assert_includes(pcpaths, LIBXML_PCP)
+      assert_includes(pcpaths, LIBXSLT_PCP)
+    end
+
+    recipe.mkmf_config(pkg: "libexslt", dir: LIBXSLT_PCP)
+
+    $INCFLAGS.split.tap do |incflags|
+      assert_includes(incflags, "-I/foo/libxml2/2.11.5/include/libxml2")
+      assert_includes(incflags, "-I/foo/libxslt/1.1.38/include")
+    end
+    assert_includes($LIBPATH, "/foo/libxml2/2.11.5/lib")
+    assert_includes($LIBPATH, "/foo/libxslt/1.1.38/lib")
+    assert_includes($LIBPATH, "/foo/zlib/1.3/lib") # from `--static`
+    $CFLAGS.split.tap do |cflags|
+      assert_includes(cflags, "-ggdb3")
+      assert_includes(cflags, "-Wno-deprecated-enum-enum-conversion")
+    end
+    $libs.split.tap do |libflags|
+      assert_includes(libflags, "-lxml2")
+      assert_includes(libflags, "-lxslt")
+      assert_includes(libflags, "-lexslt")
+      assert_includes(libflags, "-lz") # from `--static`
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.8.3
+  version: 2.8.5.rc1
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,16 +123,21 @@ files:
 - test/assets/gpg-fixtures/data.asc
 - test/assets/gpg-fixtures/data.invalid.asc
 - test/assets/patch 1.diff
+- test/assets/pkgconf/libxml2/libxml-2.0.pc
+- test/assets/pkgconf/libxslt/libexslt.pc
+- test/assets/pkgconf/libxslt/libxslt.pc
 - test/assets/test mini portile-1.0.0/configure
 - test/assets/test-cmake-1.0/CMakeLists.txt
 - test/assets/test-cmake-1.0/hello.c
 - test/assets/test-download-archive.tar.gz
 - test/helper.rb
+- test/test_activate.rb
 - test/test_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb
 - test/test_execute.rb
+- test/test_mkmf_config.rb
 - test/test_proxy.rb
 homepage: https://github.com/flavorjones/mini_portile
 licenses:
@@ -149,11 +154,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers
@@ -163,14 +168,19 @@ test_files:
 - test/assets/gpg-fixtures/data.asc
 - test/assets/gpg-fixtures/data.invalid.asc
 - test/assets/patch 1.diff
+- test/assets/pkgconf/libxml2/libxml-2.0.pc
+- test/assets/pkgconf/libxslt/libexslt.pc
+- test/assets/pkgconf/libxslt/libxslt.pc
 - test/assets/test mini portile-1.0.0/configure
 - test/assets/test-cmake-1.0/CMakeLists.txt
 - test/assets/test-cmake-1.0/hello.c
 - test/assets/test-download-archive.tar.gz
 - test/helper.rb
+- test/test_activate.rb
 - test/test_cmake.rb
 - test/test_cook.rb
 - test/test_digest.rb
 - test/test_download.rb
 - test/test_execute.rb
+- test/test_mkmf_config.rb
 - test/test_proxy.rb