mkmf-lite 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c07ed9aa3d8aef12735ec24829df062a4e0461251cbc756f1b45e4e7db0c84
-  data.tar.gz: '04393aeb022d6686e32406dc15f0370ca128ca65508ef11d07c477c1049a3728'
+  metadata.gz: 7e85aa72d40bbefbc3868cfce08cdadcd27f2715f96aead7b7055808ea724f5f
+  data.tar.gz: 415625060ad8e4d9d6998f581af4eeb0adb5c69f0a012a827956cfc19f173ff7
 SHA512:
-  metadata.gz: 69323d948af2a1c02bdb3b2189b083f66a19438c6ecfa142414b25f46465aa2c5e1860c3993d6dbac69eb337de939ef80defce1caa65267c25db6a9a5f1b9148
-  data.tar.gz: cd7610faf9fcc1638980e4938b87fa73a9beb6376e291c51ba4fdc79e616a01e4db2493211d55ccf07d1f58c94b077e15c573a403bc363f42c657b4005f347b9
+  metadata.gz: af36e6b2ffc4d90cb1faf28ebe141547b2459819f95caf6b5dded3e51dce35667eb8ea9b0bf81443146495f42c341f56f81d27d3b7b3a7862e9c2a492b4c848d
+  data.tar.gz: f78fc8d5f051406690b1d7b1b362868be38fd25a45ad140cec40bc9aaf58d0ebdf2a2b53b5c0ca4660954266938be91405660bee3fe85ad0f3a340002d92e25b

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.7.2 - 13-Mar-2025
+* Allow option of adding directories to check_sizeof and check_valueof methods.
+
+## 0.7.1 - 29-Sep-2024
+* Skip adding compiler switches for JRuby, which chokes on them for some reason.
+
 ## 0.7.0 - 13-Sep-2024
 * Append typical library switches to the compiler command. There was a private
   method already in the code but I wasn't using it.

data/README.md

@@ -48,13 +48,13 @@ since they wouldn't ever change without requiring a reboot/restart of your
 server, container, etc, anyway.
 
 ## Known Issues
-Very old versions of JRuby will emit a warning. You should upgrade.
+JRuby may emit warnings on some platforms.
 
 ## License
 Apache-2.0
 
 ## Copyright
-(C) 2010-2023 Daniel J. Berger
+(C) 2010-2024 Daniel J. Berger
 All Rights Reserved
 
 ## Warranty

data/lib/mkmf/lite.rb

@@ -16,7 +16,7 @@ module Mkmf
     extend Memoist
 
     # The version of the mkmf-lite library
-    MKMF_LITE_VERSION = '0.7.0'
+    MKMF_LITE_VERSION = '0.7.2'
 
     private
 
@@ -24,6 +24,12 @@ module Mkmf
       RbConfig::CONFIG['DEFS']
     end
 
+    def jruby?
+      defined?(JRUBY_VERSION) ? true : false
+    end
+
+    memoize :jruby?
+
     # rubocop:disable Layout/LineLength
     def cpp_command
       command = RbConfig::CONFIG['CC'] || RbConfig::CONFIG['CPP'] || File.which('cc') || File.which('gcc') || File.which('cl')
@@ -50,6 +56,7 @@ module Mkmf
 
     def cpp_libraries
       return if File::ALT_SEPARATOR && RbConfig::CONFIG['CPP'] =~ /^cl/
+      return if jruby?
 
       if cpp_command =~ /clang/i
         '-Lrt -Ldl -Lcrypt -Lm'
@@ -128,12 +135,20 @@ module Mkmf
     # If this method fails an error is raised. This could happen if the constant
     # can't be found and/or the header files do not include the indicated constant.
     #
-    def check_valueof(constant, headers = [])
+    def check_valueof(constant, headers = [], *directories)
       headers = get_header_string(headers)
       erb = ERB.new(read_template('check_valueof.erb'))
       code = erb.result(binding)
 
-      try_to_execute(code)
+      if directories.empty?
+        options = nil
+      else
+        options = ''
+        directories.each{ |dir| options += "-I#{dir} " }
+        options.rstrip!
+      end
+
+      try_to_execute(code, options)
     end
 
     memoize :check_valueof
@@ -151,12 +166,20 @@ module Mkmf
     #     utsname = check_sizeof('struct utsname', 'sys/utsname.h')
     #   end
     #
-    def check_sizeof(type, headers = [])
+    def check_sizeof(type, headers = [], *directories)
       headers = get_header_string(headers)
       erb = ERB.new(read_template('check_sizeof.erb'))
       code = erb.result(binding)
 
-      try_to_execute(code)
+      if directories.empty?
+        options = nil
+      else
+        options = ''
+        directories.each{ |dir| options += "-I#{dir} " }
+        options.rstrip!
+      end
+
+      try_to_execute(code, options)
     end
 
     memoize :check_sizeof
@@ -199,7 +222,7 @@ module Mkmf
     # we don't actually care about the reason for failure, though a Ruby
     # error is raised if the compilation step fails.
     #
-    def try_to_execute(code)
+    def try_to_execute(code, command_options = nil)
       begin
         result = 0
 
@@ -209,7 +232,12 @@ module Mkmf
         Dir.chdir(Dir.tmpdir) do
           File.write(cpp_source_file, code)
 
-          command  = "#{cpp_command} #{cpp_libraries} #{cpp_defs} "
+          if command_options
+            command  = "#{cpp_command} #{command_options} #{cpp_libraries} #{cpp_defs} "
+          else
+            command  = "#{cpp_command} #{cpp_libraries} #{cpp_defs} "
+          end
+
           command += "#{cpp_out_file} "
           command += cpp_source_file
 

data/mkmf-lite.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 Gem::Specification.new do |spec|
   spec.name       = 'mkmf-lite'
   spec.summary    = 'A lighter version of mkmf designed for use as a library'
-  spec.version    = '0.7.0'
+  spec.version    = '0.7.2'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -27,7 +27,9 @@ Gem::Specification.new do |spec|
     'documentation_uri'     => 'https://github.com/djberg96/mkmf-lite/wiki',
     'source_code_uri'       => 'https://github.com/djberg96/mkmf-lite',
     'wiki_uri'              => 'https://github.com/djberg96/mkmf-lite/wiki',
-    'rubygems_mfa_required' => 'true'
+    'rubygems_mfa_required' => 'true',
+    'github_repo'           => 'https://github.com/djberg96/mkmf-lite',
+    'funding_uri'           => 'https://github.com/sponsors/djberg96'
   }
 
   spec.description = <<-EOF

data/spec/mkmf_lite_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Mkmf::Lite do
 
   describe 'constants' do
     example 'version information' do
-      expect(described_class::MKMF_LITE_VERSION).to eq('0.7.0')
+      expect(described_class::MKMF_LITE_VERSION).to eq('0.7.2')
       expect(described_class::MKMF_LITE_VERSION).to be_frozen
     end
   end
@@ -96,8 +96,8 @@ RSpec.describe Mkmf::Lite do
       expect{ subject.check_valueof }.to raise_error(ArgumentError)
     end
 
-    example 'check_valueof accepts a maximum of two arguments' do
-      expect{ subject.check_valueof(constant, 'stdio.h', 1) }.to raise_error(ArgumentError)
+    example 'check_valueof accepts directory arguments' do
+      expect{ subject.check_valueof(constant, 'stdio.h', ['/usr/include']) }.not_to raise_error
     end
 
     example 'check_valueof works with one or two arguments' do
@@ -122,8 +122,8 @@ RSpec.describe Mkmf::Lite do
       expect{ subject.check_sizeof }.to raise_error(ArgumentError)
     end
 
-    example 'check_sizeof accepts a maximum of two arguments' do
-      expect{ subject.check_sizeof('div_t', 'stdlib.h', 1) }.to raise_error(ArgumentError)
+    example 'check_sizeof accepts directory arguments' do
+      expect{ subject.check_sizeof('div_t', 'stdlib.h', ['/usr/include']) }.not_to raise_error
     end
 
     example 'check_sizeof works with one or two arguments' do

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: mkmf-lite
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-09-14 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
@@ -160,7 +159,8 @@ metadata:
   source_code_uri: https://github.com/djberg96/mkmf-lite
   wiki_uri: https://github.com/djberg96/mkmf-lite/wiki
   rubygems_mfa_required: 'true'
-post_install_message: 
+  github_repo: https://github.com/djberg96/mkmf-lite
+  funding_uri: https://github.com/sponsors/djberg96
 rdoc_options: []
 require_paths:
 - lib
@@ -175,8 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A lighter version of mkmf designed for use as a library
 test_files: