mkmf-lite 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55c14044604c5889a36d8d2fee0ae1112c35297201f9727cf7568630cd735bfc
-  data.tar.gz: 4eecbb5306d00f09742f1969fcb30d14703f6730c9b5c9067ac9eb319a784d19
+  metadata.gz: 726b5a45c22c5700645950241fabc40621f7a1ec9f57a20fffd212623a41acd0
+  data.tar.gz: 34bc9e1d6d1c3bba0a9c73cfd7d899fda171054c73dfaaeec6305f246f0fe497
 SHA512:
-  metadata.gz: 70a74c5abed4b1efb35eea74d866ab7eee463f52dea3eefbeb6d10b81cbdcbb21661413b5b31879c4c3cdca3cb655a94ee2f0332c1e782979b11db7922ab3285
-  data.tar.gz: 3cbac4e68dbdede43b083a20713f4dc81a10ba351dd0842d9768f75218637a825e1526f43fabd5b8ea8721f79c4ee799e85994a8216716e27bbafe3d111ad3d4
+  metadata.gz: b5e4afd22216317af2dbb01ea8ead2339976c00276774b1a9e6b5a72e04e6d6ecb097863f6366ce7de93628299440a44b0663db245964d8c30bc310f72d14021
+  data.tar.gz: 0d132571eb8b470886c5e2bce7c5b80b0de36ffe563dd929d7ba479173125827a643b8d63584d7b76a6d05c8db72dd1f5c35b095f38cad707d06d29541c4103c

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.7.3 - 21-Mar-2025
+* Add check_offsetof method.
+
+## 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.
 

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.1'
+    MKMF_LITE_VERSION = '0.7.3'
 
     private
 
@@ -135,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
@@ -158,16 +166,56 @@ 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
 
+    # Returns the offset of +field+ within +struct_type+ using +headers+,
+    # or common headers, plus stddef.h, if no headers are specified.
+    #
+    # If this method fails an error is raised. This could happen if the field
+    # can't be found and/or the header files do not include the indicated type.
+    # It will also fail if the field is a bit field.
+    #
+    # Example:
+    #
+    #   class Foo
+    #     include Mkmf::Lite
+    #     utsname = check_offsetof('struct utsname', 'release', 'sys/utsname.h')
+    #   end
+    #
+    def check_offsetof(struct_type, field, headers = [], *directories)
+      headers = get_header_string(headers)
+      erb = ERB.new(read_template('check_offsetof.erb'))
+      code = erb.result(binding)
+
+      if directories.empty?
+        options = nil
+      else
+        options = ''
+        directories.each{ |dir| options += "-I#{dir} " }
+        options.rstrip!
+      end
+
+      try_to_execute(code, options)
+    end
+
+    memoize :check_offsetof
+
     private
 
     # Take an array of header file names (or convert it to an array if it's a
@@ -206,7 +254,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
 
@@ -216,7 +264,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/lib/mkmf/templates/check_offsetof.erb

@@ -0,0 +1,11 @@
+#include <stdio.h>
+#include <stddef.h>
+
+<%= headers %>
+
+int conftest_const = (int)(offsetof(<%= struct_type %>, <%= field %>));
+
+int main(){
+  printf("%d\n", conftest_const);
+  return 0;
+}

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.1'
+  spec.version    = '0.7.3'
   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.1')
+      expect(described_class::MKMF_LITE_VERSION).to eq('0.7.3')
       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
@@ -112,6 +112,33 @@ RSpec.describe Mkmf::Lite do
     end
   end
 
+  context 'check_offsetof' do
+    let(:st_field){ 'st_dev' }
+
+    example 'check_offsetof basic functionality' do
+      expect(subject).to respond_to(:check_offsetof)
+      expect{ subject.check_offsetof(st_type, st_field, st_header) }.not_to raise_error
+    end
+
+    example 'check_offsetof requires at least two arguments' do
+      expect{ subject.check_offsetof }.to raise_error(ArgumentError)
+      expect{ subject.check_offsetof(st_type) }.to raise_error(ArgumentError)
+    end
+
+    example 'check_offsetof accepts directory arguments' do
+      expect{ subject.check_offsetof(st_type, st_field, [st_header, 'stdlib.h'], ['/usr/include']) }.not_to raise_error
+    end
+
+    example 'check_offsetof returns an integer value' do
+      size1 = subject.check_offsetof(st_type, st_field, st_header)
+      size2 = subject.check_offsetof(st_type, 'st_ino', st_header)
+      expect(size1).to be_a(Integer)
+      expect(size2).to be_a(Integer)
+      expect(size1).to eq(0)
+      expect(size2).to be > size1
+    end
+  end
+
   context 'check_sizeof' do
     example 'check_sizeof basic functionality' do
       expect(subject).to respond_to(:check_sizeof)
@@ -122,8 +149,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkmf-lite
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
@@ -141,6 +141,7 @@ files:
 - certs/djberg96_pub.pem
 - lib/mkmf-lite.rb
 - lib/mkmf/lite.rb
+- lib/mkmf/templates/check_offsetof.erb
 - lib/mkmf/templates/check_sizeof.erb
 - lib/mkmf/templates/check_valueof.erb
 - lib/mkmf/templates/have_func.erb
@@ -160,6 +161,8 @@ metadata:
   source_code_uri: https://github.com/djberg96/mkmf-lite
   wiki_uri: https://github.com/djberg96/mkmf-lite/wiki
   rubygems_mfa_required: 'true'
+  github_repo: https://github.com/djberg96/mkmf-lite
+  funding_uri: https://github.com/sponsors/djberg96
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -175,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A lighter version of mkmf designed for use as a library