ffi-libarchive-binary 0.2.1-arm64-darwin → 0.2.5-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3a69fd54a98d854c32d76c0be3aeaf042e11106
-  data.tar.gz: 82d9536f1c847c47ad643587058e3c9e811e69ed
+SHA256:
+  metadata.gz: f386331ebfd86414b754e56d76fcd9bf5fab8b0f5ffeed86d2870087ba2efa81
+  data.tar.gz: 7ec54758cbd707e854978ad56da3c16b0839ea754fdaff5022eabb9cb1c82fc6
 SHA512:
-  metadata.gz: d3007db39e4d6c8c7753ebdeb4067e5085ed5e7f2b7f87385406eaf603012167d4c576cbf6068ae56b4767129380dbb854f51728a951b4b2a08d428105d61a12
-  data.tar.gz: c96e26f3e3d3c61e4dbf0d9d038000cdd432aa084ff00a7dd8c60c8788fd18c7a0dd03b6fbb34bde150b93af276ba2fc3a18d10282197faa3094446f3bd7789e
+  metadata.gz: 5c9f1c0b1e0ff4f15548cb63f71b177e1ab5d7830618d5cbe6eed2f5f22c9ce86b4c1626e1911e43b2638266bde5f05dea79c98c7d7112471c711eb4403b7891
+  data.tar.gz: b3a9a79ab62999bf651e5a7789b1522304ed643adb121bc6c74a49be9b3f8e2e50a77dce41cbdaefebe9b74a47444e4b43a938af270e88cdab98b17032831165

data/README.adoc

@@ -1,5 +1,8 @@
 = Binaries for ffi-libarchive
 
+image:https://img.shields.io/gem/v/ffi-libarchive-binary.svg["Gem Version", link="https://rubygems.org/gems/ffi-libarchive-binary"]
+image:https://github.com/fontist/ffi-libarchive-binary/actions/workflows/rspec.yml/badge.svg["Build Status", link="https://github.com/fontist/ffi-libarchive-binary/actions/workflows/rspec.yml"]
+
 == Purpose
 
 Contains pre-compiled and install-time-compiled binaries for ffi-libarchive.
@@ -49,6 +52,15 @@ reader.close
 ----
 
 
+== Dependencies
+
+* zlib
+* Expat
+* OpenSSL (for Linux only)
+
+These dependencies are generally present on all systems.
+
+
 == Development
 
 We are following Sandi Metz's Rules for this gem, you can read the

data/Rakefile

@@ -12,9 +12,6 @@ end
 desc "Define the gem task to build on any platform (compile on install)"
 task "platform:any" do
   spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
-  spec.extensions = ['ext/extconf.rb']
-  spec.add_runtime_dependency("mini_portile2", "~> 2.0")
-
   task = Gem::PackageTask.new(spec)
   task.define
 end
@@ -39,6 +36,8 @@ platforms.each do |platform, host, lib|
     spec = Gem::Specification::load("ffi-libarchive-binary.gemspec").dup
     spec.platform = Gem::Platform.new(platform)
     spec.files += ["lib/ffi-libarchive-binary/#{lib}"]
+    spec.extensions = []
+    spec.dependencies.reject! { |d| d.name == "mini_portile2" }
 
     task = Gem::PackageTask.new(spec)
     task.define
@@ -52,6 +51,12 @@ task :compile, [:host] do |_t, args|
   recipe.cook_if_not
 end
 
+desc "Recompile binary"
+task :recompile do
+  recipe = LibarchiveBinary::LibarchiveRecipe.new
+  recipe.cook
+end
+
 CLOBBER.include("pkg")
 CLEAN.include("ports",
               "tmp",

data/ffi-libarchive-binary.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.extensions    = ['ext/extconf.rb']
 
   spec.add_runtime_dependency "ffi-libarchive", "~> 1.0"
+  spec.add_runtime_dependency "mini_portile2", "~> 2.0"
 end

data/lib/ffi-libarchive-binary/libarchive_recipe.rb

@@ -1,6 +1,9 @@
 require "mini_portile2"
 require "pathname"
 
+require_relative "zlib_recipe"
+require_relative "libexpat_recipe"
+
 module LibarchiveBinary
   class LibarchiveRecipe < MiniPortile
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
@@ -13,26 +16,91 @@ module LibarchiveBinary
         sha256: "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"
       }
 
+      @zlib_recipe = ZLibRecipe.new
+      @expat_recipe = LibexpatRecipe.new
+
       @target = ROOT.join(@target).to_s
     end
 
     def configure_defaults
       [
         "--host=#{@host}",
-        "--disable-static",
-        "--enable-shared",
+        "--disable-bsdtar",
+        "--disable-bsdcat",
+        "--disable-bsdcpio",
+        "--without-bz2lib",
+        "--without-libb2",
+        "--without-iconv",
+        "--without-lz4",
+        "--without-zstd",
+        "--without-lzma",
+        "--without-cng",
+        "--without-xml2",
+        "--with-expat",
+        "--with-openssl",
+        "--disable-acl",
       ]
     end
 
+    def configure
+      paths = [@zlib_recipe.path, @expat_recipe.path]
+      cflags = paths.map { |k| "-I#{k}/include" }.join(" ")
+      cmd = ["env", "CFLAGS=#{cflags}", "./configure"] + computed_options
+
+      execute("configure", cmd)
+
+      # drop default libexpat and zlib
+      libz = File.join(@zlib_recipe.path, "lib", "libz.a")
+      libexpat = File.join(@expat_recipe.path, "lib", "libexpat.a")
+
+      if LibarchiveBinary::windows?
+        # https://stackoverflow.com/a/14112368/902217
+        static_link_pref = "-Wl,-Bstatic,"
+        libz = libz.prepend(static_link_pref)
+        libexpat = libexpat.prepend(static_link_pref)
+      end
+
+      makefile = File.join(work_path, "Makefile")
+      replace_in_file(" -lz ", " #{libz} ", makefile)
+      replace_in_file(" -lexpat ", " #{libexpat} ", makefile)
+    end
+
+    def replace_in_file(search_str, replace_str, filename)
+      puts "Replace \"#{search_str}\" with \"#{replace_str}\" in #{filename}"
+
+      f = File.open(filename, "r")
+      content = f.read
+      f.close
+
+      content.gsub!(search_str, replace_str)
+
+      File.open(filename, "w") { |f| f << content }
+    end
+
+    def activate
+      @zlib_recipe.activate
+      @expat_recipe.activate
+
+      super
+    end
+
     def cook_if_not
-      checkpoint_file = "#{self.name}-#{self.version}-#{self.host}.installed"
-      checkpoint = File.join(@target, checkpoint_file)
-      return if File.exist?(checkpoint)
+      cook unless File.exist?(checkpoint)
+    end
+
+    def cook
+      @zlib_recipe.cook_if_not
+      @expat_recipe.cook_if_not
+
+      super
 
-      cook
       FileUtils.touch(checkpoint)
     end
 
+    def checkpoint
+      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    end
+
     def patch
       super
 

data/lib/ffi-libarchive-binary/libexpat_recipe.rb

@@ -0,0 +1,46 @@
+require "mini_portile2"
+
+module LibarchiveBinary
+  # based on 
+  class LibexpatRecipe < MiniPortile
+    ROOT = Pathname.new(File.expand_path("../..", __dir__))
+
+    def initialize
+      super("libexpat", "2.4.1")
+
+      @files << {
+        url: "https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.gz",
+        sha256: "a00ae8a6b96b63a3910ddc1100b1a7ef50dc26dceb65ced18ded31ab392f132b"
+      }
+
+      @target = ROOT.join(@target).to_s
+    end
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        "--disable-shared",
+        "--enable-static",
+      ]
+    end
+
+    def configure
+      cmd = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC", "./configure"] + computed_options
+      execute("configure", cmd)
+    end
+
+    def checkpoint
+      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    end
+
+    def cook_if_not
+      cook unless File.exist?(checkpoint)
+    end
+
+    def cook
+      super
+
+      FileUtils.touch(checkpoint)
+    end
+  end
+end

data/lib/ffi-libarchive-binary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LibarchiveBinary
-  VERSION = "0.2.1"
+  VERSION = "0.2.5"
 end

data/lib/ffi-libarchive-binary/zlib_recipe.rb

@@ -0,0 +1,89 @@
+require "mini_portile2"
+require "pathname"
+
+module LibarchiveBinary
+  def self.windows?
+    RbConfig::CONFIG["target_os"] =~ /mingw32|mswin/
+  end
+
+  # inspired by https://github.com/sparklemotion/nokogiri/blob/35823bd/ext/nokogiri/extconf.rb#L655
+  class ZLibRecipe < MiniPortile
+    ROOT = Pathname.new(File.expand_path("../..", __dir__))
+
+    def initialize
+      super("zlib", "1.2.11")
+
+      @files << {
+        url: "http://zlib.net/fossils/zlib-1.2.11.tar.gz",
+        sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+      }
+
+      @target = ROOT.join(@target).to_s
+    end
+
+    def configure_defaults
+      [
+        "--static"
+      ]
+    end
+
+    def configure
+      if LibarchiveBinary::windows?
+        Dir.chdir(work_path) do
+          mk = File.read("win32/Makefile.gcc")
+          File.open("win32/Makefile.gcc", "wb") do |f|
+            f.puts "BINARY_PATH = #{path}/bin"
+            f.puts "LIBRARY_PATH = #{path}/lib"
+            f.puts "INCLUDE_PATH = #{path}/include"
+            f.puts "SHARED_MODE = 0"
+            f.puts "LOC = -fPIC"
+            f.puts mk
+          end
+        end
+      else
+        cmd = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC", "./configure"] + computed_options
+        execute("configure", cmd)
+      end
+    end
+
+    def configured?
+      if LibarchiveBinary::windows?
+        Dir.chdir(work_path) do
+          !!(File.read("win32/Makefile.gcc") =~ /^BINARY_PATH/)
+        end
+      else
+        super
+      end
+    end
+
+    def compile
+      if LibarchiveBinary::windows?
+        execute("compile", "make -f win32/Makefile.gcc libz.a")
+      else
+        super
+      end
+    end
+
+    def install
+      if LibarchiveBinary::windows?
+        execute("install", "make -f win32/Makefile.gcc install")
+      else
+        super
+      end
+    end
+
+    def checkpoint
+      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+    end
+
+    def cook_if_not
+      cook unless File.exist?(checkpoint)
+    end
+
+    def cook
+      super
+
+      FileUtils.touch(checkpoint)
+    end
+  end
+end

data/lib/ffi-libarchive-binary.rb

@@ -1,25 +1,43 @@
 # frozen_string_literal: true
 
 require "ffi-libarchive-binary/version"
-require "ffi"
 require "pathname"
 
 module LibarchiveBinary
   class Error < StandardError; end
 
-  module LibraryPath
-    LIBRARY_PATH = Pathname.new(File.join(__dir__, "ffi-libarchive-binary"))
+  LIBRARY_PATH = Pathname.new(File.join(__dir__, "ffi-libarchive-binary"))
 
-    def ffi_lib(*names)
-      prefixed = names.map do |name|
-        paths = name.is_a?(Array) ? name : [name]
-        paths.map { |x| LIBRARY_PATH.join(FFI::map_library_name(x)).to_s }
-      end
+  def self.lib_path
+    LIBRARY_PATH.join(lib_filename).to_s
+  end
 
-      super(*(prefixed + names))
+  def self.lib_filename
+    if FFI::Platform.windows?
+      "libarchive-13.dll"
+    elsif FFI::Platform.mac?
+      "libarchive.dylib"
+    else
+      "libarchive.so"
     end
   end
+end
+
+module Archive
+  module C
+    def self.ffi_lib(*args)
+      prefixed = args.map do |names|
+        paths = names.is_a?(Array) ? names : [names]
+        if paths.any? { |f| f.include?("libarchive") }
+          [LibarchiveBinary.lib_path] + paths
+        else
+          names
+        end
+      end
 
-  ::FFI::Library.prepend(LibraryPath)
-  require "ffi-libarchive"
+      super(*prefixed)
+    end
+  end
 end
+
+require "ffi-libarchive"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.5
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-libarchive
@@ -42,7 +42,9 @@ files:
 - lib/ffi-libarchive-binary.rb
 - lib/ffi-libarchive-binary/libarchive.dylib
 - lib/ffi-libarchive-binary/libarchive_recipe.rb
+- lib/ffi-libarchive-binary/libexpat_recipe.rb
 - lib/ffi-libarchive-binary/version.rb
+- lib/ffi-libarchive-binary/zlib_recipe.rb
 - updates/config.guess
 - updates/config.sub
 homepage: https://github.com/fontist/ffi-libarchive-binary
@@ -68,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.6.3
 signing_key:
 specification_version: 4
 summary: Binaries for ffi-libarchive