Merge pull request #197550 from Homebrew/pkgconf-migrations-z

z*: migrate to `pkgconf`
Homebrew · Nov 13, 2024 · 6a364b1 · 6a364b1
2 parents f493335 + adbdcb0
commit 6a364b1
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 19 deletions.
diff --git a/Formula/z/zabbix.rb b/Formula/z/zabbix.rb
@@ -20,7 +20,7 @@ class Zabbix < Formula
     sha256 x86_64_linux:  "d851e1afd7362e58ddb489d06f7990aafd7acc1ead3fa4758a3ebc964a8c4be2"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "openssl@3"
   depends_on "pcre2"
 

diff --git a/Formula/z/zbar.rb b/Formula/z/zbar.rb
@@ -29,7 +29,7 @@ class Zbar < Formula
     depends_on "libtool" => :build
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "xmlto" => :build
 
   depends_on "imagemagick"
@@ -50,8 +50,6 @@ class Zbar < Formula
     depends_on "dbus"
   end
 
-  fails_with gcc: "5" # imagemagick is built with GCC
-
   def install
     ENV["XML_CATALOG_FILES"] = etc/"xml/catalog"
 

diff --git a/Formula/z/zchunk.rb b/Formula/z/zchunk.rb
@@ -19,7 +19,7 @@ class Zchunk < Formula
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "openssl@3"
   depends_on "zstd"
 

diff --git a/Formula/z/zenity.rb b/Formula/z/zenity.rb
@@ -19,7 +19,7 @@ class Zenity < Formula
   depends_on "itstool" => :build
   depends_on "meson" => :build
   depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
 
   depends_on "glib"
   depends_on "gtk4"

diff --git a/Formula/z/zeromq.rb b/Formula/z/zeromq.rb
@@ -31,7 +31,7 @@ class Zeromq < Formula
   end
 
   depends_on "asciidoc" => :build
-  depends_on "pkg-config" => [:build, :test]
+  depends_on "pkgconf" => [:build, :test]
   depends_on "xmlto" => :build
 
   depends_on "libsodium"
@@ -49,7 +49,7 @@ def install
     # https://github.com/Homebrew/homebrew-core/pull/35940#issuecomment-454177261
 
     system "./autogen.sh" if build.head?
-    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}", "--with-libsodium"
+    system "./configure", "--with-libsodium", *std_configure_args
     system "make"
     system "make", "install"
   end

diff --git a/Formula/z/zigmod.rb b/Formula/z/zigmod.rb
@@ -19,7 +19,7 @@ class Zigmod < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "41a39652f9ed4f90a02280a3064bfa9a16746fda7af518d886280e86dceeb068"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "zig"
 
   def install

diff --git a/Formula/z/zile.rb b/Formula/z/zile.rb
@@ -26,7 +26,7 @@ class Zile < Formula
   end
 
   depends_on "help2man" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "bdw-gc"
   depends_on "glib"
   depends_on "libgee"
@@ -38,7 +38,7 @@ def install
     # which causes src/eval.vala:87:32: error: incompatible function pointer types passing
     ENV.append_to_cflags "-Wno-incompatible-function-pointer-types" if DevelopmentTools.clang_build_version >= 1500
 
-    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
+    system "./configure", *std_configure_args
     system "make", "install"
   end
 

diff --git a/Formula/z/zim.rb b/Formula/z/zim.rb
@@ -13,7 +13,7 @@ class Zim < Formula
     sha256 cellar: :any_skip_relocation, all: "f4824f56d36bfe7a27b6e5ca299247eb1e1a85416c112506303164ce6ac9f28f"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "adwaita-icon-theme"
   depends_on "graphviz"
   depends_on "gtk+3"

diff --git a/Formula/z/zizmor.rb b/Formula/z/zizmor.rb
@@ -14,7 +14,7 @@ class Zizmor < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "b5f97ebc4657bba502de43e00a21177f858e1c2c91948b94ee051cfad331ecf3"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
 
   on_linux do

diff --git a/Formula/z/zmap.rb b/Formula/z/zmap.rb
@@ -25,7 +25,7 @@ class Zmap < Formula
   depends_on "byacc" => :build
   depends_on "cmake" => :build
   depends_on "gengetopt" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "gmp"
   depends_on "json-c"
   depends_on "judy"

diff --git a/Formula/z/znc.rb b/Formula/z/znc.rb
@@ -21,7 +21,7 @@ class Znc < Formula
   end
 
   depends_on "cmake" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "boost"
   depends_on "icu4c@76"
   depends_on "openssl@3"

diff --git a/Formula/z/zola.rb b/Formula/z/zola.rb
@@ -16,7 +16,7 @@ class Zola < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:   "9d6138aa7ff35d309d8c8a3c17ab9552bb8b9465427701fc7cf5d869c2c6e940"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "rust" => :build
   depends_on "oniguruma" # for onig_sys
 

diff --git a/Formula/z/zookeeper.rb b/Formula/z/zookeeper.rb
@@ -21,7 +21,7 @@ class Zookeeper < Formula
   depends_on "cppunit" => :build
   depends_on "libtool" => :build
   depends_on "maven" => :build
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
 
   depends_on "openjdk"
   depends_on "openssl@3"

diff --git a/Formula/z/zurl.rb b/Formula/z/zurl.rb
@@ -21,7 +21,7 @@ class Zurl < Formula
     sha256 cellar: :any_skip_relocation, x86_64_linux:  "e03115779822a91ea2c4547dae103f6538beeab596a56251aad671519c1becd8"
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "cmake" => :test # for scikit_build_core
   depends_on "cython" => :test # use brew cython as building it in test can cause time out
   depends_on "[email protected]" => :test

diff --git a/Formula/z/zyre.rb b/Formula/z/zyre.rb
@@ -37,7 +37,7 @@ class Zyre < Formula
     depends_on "libtool" => :build
   end
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
   depends_on "czmq"
   depends_on "zeromq"