pngcheck 0.2.5-x86_64-darwin → 0.2.6-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef6b5400dda798aa679ae92fc2d815eb5e5331dd5fb5a9c0a5ef3e928bfeef8
-  data.tar.gz: 20f435518b35ee7de06b74dbe82da2b455993341c5c95a112c76dc5ddf920df0
+  metadata.gz: 37776d166a7a808f5917bac5880d530fd6faf8d393d1781099db5b0a5183e499
+  data.tar.gz: 5be045583e282a219e94abea5476159ce2fabe13f9ad41d9be4863a1ab36cfca
 SHA512:
-  metadata.gz: b92367c4009e877e1ad8d27501b0377c506c4d58a904f75ab427bcc1c2fa763e3b3e3b49dbd667c128cdd1253f47a4037ace5e3889c03ac56a032968597088c6
-  data.tar.gz: 956795e0fe1c16f5fb8c01c49ef9bd81decffda368de047affc8aebef4e11a641b9ee583ba61c85cd73bbb8883382a6adc20c19cea240f5d07ca1c0833ac3032
+  metadata.gz: fd82c9b8d6bd61362cd505f376be0a3654b5f6842f789b59781ed6960a2cdb61102b8b31b69d32469788afe739276964269d1f7f447478fca218431ac2c7890e
+  data.tar.gz: 0b9bc558188bd10c957939818693766ca4a9a540547d2ef5bd7d8c63ccb9da3666008d69f1868532a0685c3a564c3ec8aa4ca5f2d9603b6a7c5a91a5a9cfbb86

data/lib/pngcheck/recipe.rb

@@ -13,12 +13,16 @@ module PngCheck
     ROOT = Pathname.new(File.expand_path("../..", __dir__))
     COMMON_FLAGS = "-shared -fPIC -Wall -O -DUSE_ZLIB"
 
-    def files_to_load
+    def files_to_load_all
       @files << {
         url: "http://www.libpng.org/pub/png/src/pngcheck-3.0.3.tar.gz",
         sha256: "c36a4491634af751f7798ea421321642f9590faa032eccb0dd5fb4533609dee6", # rubocop:disable Layout/LineLength
       }
-      if target_platform.eql?("aarch64-linux")
+    end
+
+    def files_to_load_cross
+      if target_platform.eql?("aarch64-linux") &&
+          !host_platform.eql?("aarch64-linux")
         @files << {
           url: "http://ports.ubuntu.com/pool/main/z/zlib/zlib1g-dev_1.2.11.dfsg-2ubuntu1.3_arm64.deb", # rubocop:disable Layout/LineLength
           sha256: "0ebadc1ff2a70f0958d4e8e21ffa97d9fa4da23555eaae87782e963044a26fcf", # rubocop:disable Layout/LineLength
@@ -28,17 +32,27 @@ module PngCheck
 
     def initialize
       super("pngcheck", "3.0.3")
-      files_to_load
+      files_to_load_all
+      files_to_load_cross
       @target = ROOT.join(@target).to_s
       @printed = {}
     end
 
+    def lib_filename
+      @lib_filename ||=
+        if MiniPortile.windows?
+          "pngcheck.dll"
+        else
+          "pngcheck.so"
+        end
+    end
+
+    def lib_workpath
+      @lib_workpath ||= File.join(work_path, lib_filename)
+    end
+
     def make_cmd
-      if MiniPortile.windows?
-        "gcc #{COMMON_FLAGS} -o pngcheck.dll wrapper.c -lz"
-      else
-        "#{cc} #{cflags} #{COMMON_FLAGS} -o pngcheck.so wrapper.c -lz"
-      end
+      "#{cc} #{cflags} #{COMMON_FLAGS} -o #{lib_filename} wrapper.c -lz"
     end
 
     def cook_if_not
@@ -56,29 +70,25 @@ module PngCheck
 
     def configure
       FileUtils.cp(ROOT.join("ext", "wrapper.c"), work_path, verbose: false)
-      if target_platform.eql?("aarch64-linux")
+      if target_platform.eql?("aarch64-linux") &&
+          !host_platform.eql?("aarch64-linux")
         extract_file("#{work_path}/../data.tar.xz", work_path.to_s)
       end
     end
 
-    def libs_to_verify
-      Dir.glob(ROOT.join("lib", "pngcheck",
-                         "pngcheck.{so,dylib,dll}"))
-    end
-
-    def verify_libs
-      libs_to_verify.each do |l|
-        out, st = Open3.capture2("file #{l}")
-        out = out.strip
-
-        raise "Failed to query file #{l}: #{out}" unless st.exitstatus.zero?
+    def verify_lib
+      begin
+        out, = Open3.capture2("file #{lib_workpath}")
+      rescue StandardError
+        message("Failed to call file, skipped library verification ...\n")
+        return
+      end
 
-        if out.include?(target_format)
-          message("Verifying #{l} ... OK\n")
-        else
-          raise "Invalid file format '#{out}', '#{@target_format}' expected"
-        end
+      unless out.include?(target_format)
+        raise "Invalid file format '#{out.strip}', '#{@target_format}' expected"
       end
+
+      message("Verifying #{lib_workpath} ... OK\n")
     end
 
     def install
@@ -86,7 +96,7 @@ module PngCheck
         .grep(%r{/(?:lib)?[a-zA-Z0-9\-]+\.(?:so|dylib|dll)$})
 
       FileUtils.cp_r(libs, ROOT.join("lib", "pngcheck"), verbose: false)
-      verify_libs
+      verify_lib
     end
 
     def execute(action, command, command_opts = {})
@@ -174,11 +184,11 @@ module PngCheck
 
     def cflags
       @cflags ||=
-        if target_platform.eql?(host_platform) ||
-            !target_platform.eql?("aarch64-linux")
-          ""
-        else
+        if target_platform.eql?("aarch64-linux") &&
+            !host_platform.eql?("aarch64-linux")
           "-I./usr/include -L./usr/lib/#{target_platform}-gnu"
+        else
+          ""
         end
     end
     # rubocop:enable Metrics/CyclomaticComplexity

data/lib/pngcheck/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pngcheck
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: x86_64-darwin
 authors:
 - Ribose Inc.