ffi-libarchive-binary 0.5.2-x86_64-linux-gnu → 0.5.3-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2851f116bad909c02839fc1b39eaf560d5589f472727b47b57955f2c85c095
-  data.tar.gz: 16290ff8ed61e27046e1c59bef1a19d23660d966be28c5f56dcfc2b8d33449de
+  metadata.gz: d00a6aed94af704d9af603fe36bf298074b2c090388e45a6bc19bd0cc3030a3d
+  data.tar.gz: 72744d1a5cceab304727bb9cb8ee5e44d618f8bec43fad9937f94b2241be28be
 SHA512:
-  metadata.gz: 24d27dc922c15a8f5b61dfc7fbfbdbce5218509a62ac5c4b735309a7f5a9d421146f70a7e8a0e599af09d9ee0fb2c3313e1297d16d61c1d711be21526fbf4d85
-  data.tar.gz: 1f88ef2183ad80db070d6aeb860fbde69b3548585cfa9e2e6fb2718d3ba3e93f8836712f3520437403e367a6d7d6258cac0fbf2f2e8badbe49ebc29d12d0f8dc
+  metadata.gz: 46e4e4908949c56c932dfa09add7335d3bc4bc56426e45e7aa1077379cdab5bc74741819ab2d134a773c33f9ce37c8d8a4bbb50fa85db227e2f9114fc3ec37fd
+  data.tar.gz: 6a96b2881b76faa44afee725faa46813633fa2d0ed4359d110704da56212697113a3563e720158524ea8f36e4f9ef975626a4cc6d30d3e99dae0274d5f73b58b

data/ext/configuration.yml

@@ -4,6 +4,11 @@ libraries:
   # - OpenSSL uses version 1.1.1w for Windows x64 (more stable for x86_64)
   # - xz uses version 5.2.4 for all Windows platforms (MinGW compatibility)
   # - Other libraries use cross-platform versions under 'all'
+  libiconv:
+    all:
+      version: "1.18"
+      url: "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.18.tar.gz"
+      sha256: "3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8"
   zlib:
     all:
       version: "1.3.2"

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

@@ -20,7 +20,7 @@ module LibarchiveBinary
   def self.library_for(libname)
     if MiniPortile::windows?
       # Detect Windows ARM64
-      if RUBY_PLATFORM =~ /aarch64|arm64/i
+      if RUBY_PLATFORM.match?(/aarch64|arm64/i)
         libraries[libname]["windows-arm64"] || libraries[libname]["windows"] || libraries[libname]["all"]
       else
         libraries[libname]["windows-x64"] || libraries[libname]["windows"] || libraries[libname]["all"]

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

@@ -7,6 +7,7 @@ require_relative "configuration"
 require_relative "base_recipe"
 require_relative "zlib_recipe"
 require_relative "libexpat_recipe"
+require_relative "libiconv_recipe"
 require_relative "openssl_recipe"
 require_relative "xz_recipe"
 
@@ -32,6 +33,7 @@ module LibarchiveBinary
     def create_dependencies
       @zlib_recipe = ZLibRecipe.new
       @expat_recipe = LibexpatRecipe.new
+      @iconv_recipe = LibiconvRecipe.new
       @openssl_recipe = OpensslRecipe.new
       @xz_recipe = XZRecipe.new
     end
@@ -42,10 +44,10 @@ module LibarchiveBinary
 
     def default_flags
       [
-        "-DENABLE_OPENSSL:BOOL=ON",   "-DENABLE_LIBB2:BOOL=OFF",      "-DENABLE_LZ4:BOOL=OFF",
-        "-DENABLE_LZO::BOOL=OFF",     "-DENABLE_LZMA:BOOL=ON",        "-DENABLE_ZSTD:BOOL=OFF",
-        "-DENABLE_ZLIB::BOOL=ON",     "-DENABLE_BZip2:BOOL=OFF",      "-DENABLE_LIBXML2:BOOL=OFF",
-        "-DENABLE_EXPAT::BOOL=ON",    "-DENABLE_TAR:BOOL=OFF",        "-DENABLE_CPIO::BOOL=OFF",
+        "-DENABLE_OPENSSL:BOOL=ON", "-DENABLE_LIBB2:BOOL=OFF", "-DENABLE_LZ4:BOOL=OFF",
+        "-DENABLE_LZO:BOOL=OFF",     "-DENABLE_LZMA:BOOL=ON",        "-DENABLE_ZSTD:BOOL=OFF",
+        "-DENABLE_ZLIB:BOOL=ON",     "-DENABLE_BZip2:BOOL=OFF",      "-DENABLE_LIBXML2:BOOL=OFF",
+        "-DENABLE_EXPAT:BOOL=ON",    "-DENABLE_TAR:BOOL=OFF",        "-DENABLE_CPIO:BOOL=OFF",
         "-DENABLE_CAT:BOOL=OFF",      "-DENABLE_ACL:BOOL=OFF",        "-DENABLE_TEST:BOOL=OFF",
         "-DENABLE_UNZIP:BOOL=OFF",    "-DOPENSSL_USE_STATIC_LIBS=ON", "-DENABLE_XAR:BOOL=ON",
 
@@ -53,7 +55,11 @@ module LibarchiveBinary
         "-DOPENSSL_ROOT_DIR:PATH=#{@openssl_recipe.path}",
 
         # Add include paths to C flags so CMake's header detection can find them
-        "-DCMAKE_C_FLAGS=-I#{@expat_recipe.path}/include -I#{@openssl_recipe.path}/include -I#{@xz_recipe.path}/include -I#{@zlib_recipe.path}/include",
+        "-DCMAKE_C_FLAGS=-I#{@expat_recipe.path}/include " \
+        "-I#{@iconv_recipe.path}/include " \
+        "-I#{@openssl_recipe.path}/include " \
+        "-I#{@xz_recipe.path}/include " \
+        "-I#{@zlib_recipe.path}/include",
 
         # Provide search paths for CMake to find libraries
         "-DCMAKE_INCLUDE_PATH:STRING=#{include_path}",
@@ -71,18 +77,19 @@ module LibarchiveBinary
     end
 
     def include_path
-      paths = [@zlib_recipe.path, @expat_recipe.path, @openssl_recipe.path, @xz_recipe.path]
+      paths = [@zlib_recipe.path, @expat_recipe.path, @iconv_recipe.path, @openssl_recipe.path, @xz_recipe.path]
       paths.map { |k| "#{k}/include" }.join(";")
     end
 
     def library_path
-      paths = [@zlib_recipe.path, @expat_recipe.path, @openssl_recipe.path, @xz_recipe.path]
+      paths = [@zlib_recipe.path, @expat_recipe.path, @iconv_recipe.path, @openssl_recipe.path, @xz_recipe.path]
       paths.map { |k| "#{k}/lib;#{k}/lib64" }.join(";")
     end
 
     def activate
       @zlib_recipe.activate
       @expat_recipe.activate
+      @iconv_recipe.activate
       @openssl_recipe.activate
       @xz_recipe.activate
 
@@ -100,6 +107,9 @@ module LibarchiveBinary
       @expat_recipe.host = @host if @host
       @expat_recipe.cook_if_not
 
+      @iconv_recipe.host = @host if @host
+      @iconv_recipe.cook_if_not
+
       @openssl_recipe.host = @host if @host
       @openssl_recipe.cook_if_not
 
@@ -107,8 +117,8 @@ module LibarchiveBinary
       @xz_recipe.cook_if_not
 
       # Set explicit LZMA environment variables for libarchive configure
-      ENV['LIBLZMA_CFLAGS'] = "-I#{@xz_recipe.path}/include"
-      ENV['LIBLZMA_LIBS'] = "-L#{@xz_recipe.path}/lib -llzma"
+      ENV["LIBLZMA_CFLAGS"] = "-I#{@xz_recipe.path}/include"
+      ENV["LIBLZMA_LIBS"] = "-L#{@xz_recipe.path}/lib -llzma"
 
       super
 

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

@@ -21,7 +21,7 @@ module LibarchiveBinary
       # Set cross-compiler environment variables for aarch64
       env_vars = cross_compiler_env(host)
       cmd = ["env"] + env_vars.map { |k, v| "#{k}=#{v}" } +
-            [cflags(host), ldflags(host), "./configure"] + computed_options
+        [cflags(host), ldflags(host), "./configure"] + computed_options
       execute("configure", cmd)
     end
 

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "base_recipe"
+
+module LibarchiveBinary
+  class LibiconvRecipe < BaseRecipe
+    def initialize
+      super("libiconv")
+
+      @target = ROOT.join(@target).to_s
+    end
+
+    def configure_defaults
+      [
+        "--host=#{@host}",
+        "--disable-shared",
+        "--enable-static",
+        "--disable-nls",
+      ]
+    end
+
+    def configure
+      # Set cross-compiler environment variables for aarch64
+      env_vars = cross_compiler_env(host)
+      cmd = ["env"] + env_vars.map { |k, v| "#{k}=#{v}" } +
+        [cflags(host), ldflags(host), "./configure"] + computed_options
+      execute("configure", cmd)
+    end
+
+    def checkpoint
+      File.join(@target, "#{name}-#{version}-#{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/libxml2_recipe.rb

@@ -28,7 +28,7 @@ module LibarchiveBinary
         "--without-http",
         "--without-ftp",
         "--enable-static",
-        "--disable-shared"
+        "--disable-shared",
       ]
     end
 
@@ -52,4 +52,4 @@ module LibarchiveBinary
       FileUtils.touch(checkpoint)
     end
   end
-end
+end

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

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

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

@@ -21,7 +21,7 @@ module LibarchiveBinary
       # Set cross-compiler environment variables for aarch64
       env_vars = cross_compiler_env(host)
       cmd = ["env"] + env_vars.map { |k, v| "#{k}=#{v}" } +
-            [cflags(host), ldflags(host), "./configure"] + computed_options
+        [cflags(host), ldflags(host), "./configure"] + computed_options
       execute("configure", cmd)
     end
 

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

@@ -36,7 +36,7 @@ module LibarchiveBinary
         # Set cross-compiler environment variables for aarch64
         env_vars = cross_compiler_env(host)
         cmd = ["env"] + env_vars.map { |k, v| "#{k}=#{v}" } +
-              [cflags(host), ldflags(host), "./configure"] + computed_options
+          [cflags(host), ldflags(host), "./configure"] + computed_options
         execute("configure", cmd)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive-binary
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: x86_64-linux-gnu
 authors:
 - Ribose Inc.
@@ -116,6 +116,7 @@ files:
 - lib/ffi-libarchive-binary/libarchive.so
 - lib/ffi-libarchive-binary/libarchive_recipe.rb
 - lib/ffi-libarchive-binary/libexpat_recipe.rb
+- lib/ffi-libarchive-binary/libiconv_recipe.rb
 - lib/ffi-libarchive-binary/libxml2_recipe.rb
 - lib/ffi-libarchive-binary/openssl_recipe.rb
 - lib/ffi-libarchive-binary/version.rb