From 58336a663a85304c0a2e57554ab5f93476d6f07c Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:31:57 -0500 Subject: [PATCH 01/15] zabbix: migrate to `pkgconf` --- Formula/z/zabbix.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zabbix.rb b/Formula/z/zabbix.rb index 3d9c0b514bce..6c3cb898731d 100644 --- 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" From 20d52ea284eee601eaeebef6f2a55e9aed6de315 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:32:45 -0500 Subject: [PATCH 02/15] zbar: migrate to `pkgconf` --- Formula/z/zbar.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Formula/z/zbar.rb b/Formula/z/zbar.rb index f7c87d8b0991..036d2dfe6403 100644 --- 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" From 2177802c0ede7921ea8bee1c58adeaffc17da2f8 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:33:04 -0500 Subject: [PATCH 03/15] zchunk: migrate to `pkgconf` --- Formula/z/zchunk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zchunk.rb b/Formula/z/zchunk.rb index 417b4a68e4b9..44c4893b7da4 100644 --- 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" From 5a19d9da3ddc47c53d76500be2963aa4220d56f5 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:33:28 -0500 Subject: [PATCH 04/15] zenity: migrate to `pkgconf` --- Formula/z/zenity.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zenity.rb b/Formula/z/zenity.rb index 065490168dc9..4bd02b0fed37 100644 --- 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" From 48ba48e6268f8f453202888a56d82efca4456096 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:35:17 -0500 Subject: [PATCH 05/15] zeromq: migrate to `pkgconf` --- Formula/z/zeromq.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/z/zeromq.rb b/Formula/z/zeromq.rb index 7ac5314a7fe3..934ee966b5e2 100644 --- 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 From be2f61f57ebd8337b63bdc287c146bb4527e740b Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:36:16 -0500 Subject: [PATCH 06/15] zigmod: migrate to `pkgconf` --- Formula/z/zigmod.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zigmod.rb b/Formula/z/zigmod.rb index 626fe418cbd4..22cf2713199d 100644 --- 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 From e380a604704b9a9f74eefd031d2598bc95a57f2c Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:36:39 -0500 Subject: [PATCH 07/15] zile: migrate to `pkgconf` --- Formula/z/zile.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/z/zile.rb b/Formula/z/zile.rb index bf8c0dfe8a03..47ee7260d0cf 100644 --- 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 From dc4aa3f731ebc02fc7f9c4e22285af19b8207bdb Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:36:54 -0500 Subject: [PATCH 08/15] zim: migrate to `pkgconf` --- Formula/z/zim.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zim.rb b/Formula/z/zim.rb index 3fd75a90285f..c9fd4a4152ee 100644 --- 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" From eb1836031bc91b78a7702a23e2ef39ce4dcf5fc0 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:37:12 -0500 Subject: [PATCH 09/15] zizmor: migrate to `pkgconf` --- Formula/z/zizmor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zizmor.rb b/Formula/z/zizmor.rb index dee6ddcbcbdd..cc4aa87fb3e1 100644 --- 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 From 0866a0e4bf5ffaa200351386caec57cf80c83787 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:37:28 -0500 Subject: [PATCH 10/15] zmap: migrate to `pkgconf` --- Formula/z/zmap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zmap.rb b/Formula/z/zmap.rb index 544eb39c38e2..ad08c6ecb417 100644 --- 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" From 71f3dcdcc2f3811ba27f6c87d14d6c6ffa46c8ea Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:37:41 -0500 Subject: [PATCH 11/15] znc: migrate to `pkgconf` --- Formula/z/znc.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/znc.rb b/Formula/z/znc.rb index 498463f9b221..eb48636d9b5c 100644 --- 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" From 688dcd27fb2cfd0ee55245e230fb9426a86e591a Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:37:54 -0500 Subject: [PATCH 12/15] zola: migrate to `pkgconf` --- Formula/z/zola.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zola.rb b/Formula/z/zola.rb index 70ce627b36a7..36a29898c8b4 100644 --- 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 From 07bac5f5f319217c0f108a3dc5fdb36d264195d7 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:38:04 -0500 Subject: [PATCH 13/15] zookeeper: migrate to `pkgconf` --- Formula/z/zookeeper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zookeeper.rb b/Formula/z/zookeeper.rb index 0dbd56e900d5..3e77b7150497 100644 --- 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" From e597a42b7c42d791fa776e1b5472a9c504b3e0c9 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:38:15 -0500 Subject: [PATCH 14/15] zurl: migrate to `pkgconf` --- Formula/z/zurl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zurl.rb b/Formula/z/zurl.rb index b227c1b8ef22..60d6ecd4d050 100644 --- 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 "python@3.13" => :test From adbdcb01db0d6abb0042b6e78d12ea6ed68fead3 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Wed, 13 Nov 2024 02:38:35 -0500 Subject: [PATCH 15/15] zyre: migrate to `pkgconf` --- Formula/z/zyre.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/z/zyre.rb b/Formula/z/zyre.rb index f213088e6b14..16472d0279ea 100644 --- 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"