ffi-libarchive-binary 0.2.6-x64-mingw32 → 0.3.0-x64-mingw32

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

@@ -1,13 +1,10 @@
-require "mini_portile2"
+# frozen_string_literal: true
+
 require "pathname"
+require_relative "base_recipe"
 
 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
+  class ZLibRecipe < BaseRecipe
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
 
     def initialize
@@ -15,7 +12,7 @@ module LibarchiveBinary
 
       @files << {
         url: "http://zlib.net/fossils/zlib-1.2.11.tar.gz",
-        sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+        sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
       }
 
       @target = ROOT.join(@target).to_s
@@ -23,31 +20,36 @@ module LibarchiveBinary
 
     def configure_defaults
       [
-        "--static"
+        "--static",
       ]
     end
 
+    def configure_windows
+      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
+
     def configure
-      if LibarchiveBinary::windows?
+      if MiniPortile::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
+          configure_windows
         end
       else
-        cmd = ["env", "CFLAGS=-fPIC", "LDFLAGS=-fPIC", "./configure"] + computed_options
+        cmd = ["env", cflags(host), ldflags(host),
+               "./configure"] + computed_options
         execute("configure", cmd)
       end
     end
 
     def configured?
-      if LibarchiveBinary::windows?
+      if MiniPortile::windows?
         Dir.chdir(work_path) do
           !!(File.read("win32/Makefile.gcc") =~ /^BINARY_PATH/)
         end
@@ -57,7 +59,7 @@ module LibarchiveBinary
     end
 
     def compile
-      if LibarchiveBinary::windows?
+      if MiniPortile::windows?
         execute("compile", "make -f win32/Makefile.gcc libz.a")
       else
         super
@@ -65,7 +67,7 @@ module LibarchiveBinary
     end
 
     def install
-      if LibarchiveBinary::windows?
+      if MiniPortile::windows?
         execute("install", "make -f win32/Makefile.gcc install")
       else
         super
@@ -73,7 +75,7 @@ module LibarchiveBinary
     end
 
     def checkpoint
-      File.join(@target, "#{self.name}-#{self.version}-#{self.host}.installed")
+      File.join(@target, "#{name}-#{version}-#{host}.installed")
     end
 
     def cook_if_not
@@ -86,4 +88,4 @@ module LibarchiveBinary
       FileUtils.touch(checkpoint)
     end
   end
-end
+end

data/lib/ffi-libarchive-binary.rb

@@ -14,7 +14,7 @@ module LibarchiveBinary
 
   def self.lib_filename
     if FFI::Platform.windows?
-      "libarchive-13.dll"
+      "libarchive.dll"
     elsif FFI::Platform.mac?
       "libarchive.dylib"
     else

data/toolchain/aarch64-linux-gnu.cmake

@@ -0,0 +1,25 @@
+#
+# CMake Toolchain file for crosscompiling for aarch64-linux-gnu.
+#
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(TOOLCHAIN_PREFIX aarch64-linux-gnu-)
+execute_process(
+  COMMAND which ${TOOLCHAIN_PREFIX}gcc
+  OUTPUT_VARIABLE BINUTILS_PATH
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+get_filename_component(AARCH64_TOOLCHAIN_DIR ${BINUTILS_PATH} DIRECTORY)
+
+set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc)
+set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
+set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++)
+set(CMAKE_C_COMPILER_WORKS 1)
+set(CMAKE_CXX_COMPILER_WORKS 1)
+
+set(CMAKE_FIND_ROOT_PATH ${BINUTILS_PATH})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

metadata

@@ -1,15 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.22
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.22
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ffi-libarchive
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +58,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 description: Contains pre-compiled and install-time-compiled binaries for ffi-libarchive
 email:
 - open.source@ribose.com
@@ -33,6 +123,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - README.adoc
 - Rakefile
@@ -40,13 +131,15 @@ files:
 - ext/extconf.rb
 - ffi-libarchive-binary.gemspec
 - lib/ffi-libarchive-binary.rb
-- lib/ffi-libarchive-binary/libarchive-13.dll
+- lib/ffi-libarchive-binary/base_recipe.rb
+- lib/ffi-libarchive-binary/libarchive.dll
 - lib/ffi-libarchive-binary/libarchive_recipe.rb
 - lib/ffi-libarchive-binary/libexpat_recipe.rb
+- lib/ffi-libarchive-binary/openssl_recipe.rb
 - lib/ffi-libarchive-binary/version.rb
+- lib/ffi-libarchive-binary/xz_recipe.rb
 - lib/ffi-libarchive-binary/zlib_recipe.rb
-- updates/config.guess
-- updates/config.sub
+- toolchain/aarch64-linux-gnu.cmake
 homepage: https://github.com/fontist/ffi-libarchive-binary
 licenses:
 - BSD-3-Clause
@@ -62,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="