Pārlūkot izejas kodu

use `pkgconf` instead of `pkg-config` when on bsd in imagemagick package (#432)

* initial attempt at using pkgconf for bsd

* update pkgconf path

* fix adding pkg-config dep

* replace set_env with add_env

* no underscore

* update adding env var
Ashley 4 gadi atpakaļ
vecāks
revīzija
2a7a95fb74
1 mainītis faili ar 14 papildinājumiem un 1 dzēšanām
  1. 14 1
      packages/i/imagemagick/xmake.lua

+ 14 - 1
packages/i/imagemagick/xmake.lua

@@ -19,7 +19,6 @@ package("imagemagick")
     add_configs("xml", {description = "Enable XML support.", default = false, type = "boolean"})
     add_configs("webp", {description = "Enable webp support.", default = false, type = "boolean"})
 
-    add_deps("pkg-config")
     add_includedirs("include/ImageMagick-7/")
     add_links("MagickWand-7.Q16", "MagickCore-7.Q16", "Magick++-7.Q16")
 
@@ -38,6 +37,7 @@ package("imagemagick")
                             tiff       = "libtiff",
                             xml        = "libxml2",
                             webp       = "libwebp"}
+
         for name, dep in pairs(configdeps) do
             if package:config(name) then
                 package:add("deps", dep)
@@ -46,9 +46,22 @@ package("imagemagick")
                 end
             end
         end
+
         if package:config("threads") and package:is_plat("linux") then
             package:add("syslinks", "pthread")
         end
+
+        if package:is_plat("linux") then
+            package:add("deps", "pkg-config")
+        end
+
+        if package:is_plat("bsd") then
+            package:add("deps", "pkgconf")
+            local pkgconf = package:find_tool("pkgconf")
+            if pkgconf then
+                package:addenv("PKG_CONFIG", pkgconf.program)
+            end
+        end
     end)
 
     on_install("linux", "macosx", "bsd", function(package)