ffi-libarchive-binary 0.2.4-x86-linux → 0.2.5-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69e4b963b4e2b5cf3795313799bd681c1f0271d6
-  data.tar.gz: cafd44b7faf3201ce10f083b53de4e09126ec4b5
+SHA256:
+  metadata.gz: 98d172f89717aac256c3fe7d50913f1b56c8f770ce8731102a847a3bc7668af4
+  data.tar.gz: 4306bf9f1ce37d85a328c7f0b5ba7599a7d6e06dbe3e664aaceb21ad2ad8219d
 SHA512:
-  metadata.gz: de2f29f5f066dd81a6ec2607e33b52abd612528676e2ee276c2b5417685fd1ab0f6a6291772e2269b1e552fb9acf562ab5e7409d7175dfb6e2da0da127a0bca5
-  data.tar.gz: c6cf8b691032ccc95ab133df119fac91bc7a39e90e0a4f95265977dab3f600bd667f7a77c416f2922aa81adfab9d1056be820d2dadec4ab8f9f876c8a4cf9461
+  metadata.gz: a4195274fa5473e20f69a7863020efa083884b8364082300eb3a24e26d7a95762d2985271518ba04b7fcda4a596a10331e24aa391af52e5f3166d19671490ac2
+  data.tar.gz: 792740fe41468422fdd8b328fb0aa6188c33f4d5d4419bd5ebccafe3ba42f5760a846eaab685e2d65df41039390744a809b461461e192abf0a871290f41faf7f

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,6 +16,9 @@ module LibarchiveBinary
         sha256: "9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"
       }
 
+      @zlib_recipe = ZLibRecipe.new
+      @expat_recipe = LibexpatRecipe.new
+
       @target = ROOT.join(@target).to_s
     end
 
@@ -36,11 +42,56 @@ module LibarchiveBinary
       ]
     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
       cook unless File.exist?(checkpoint)
     end
 
     def cook
+      @zlib_recipe.cook_if_not
+      @expat_recipe.cook_if_not
+
       super
 
       FileUtils.touch(checkpoint)

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.4"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: x86-linux
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-21 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.so
 - 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