From 939b678ebbb4c10c94bf0c96fc9776e142eed314 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:07:39 -0500 Subject: [PATCH 01/25] libdnet: migrate to `pkgconf` --- Formula/lib/libdnet.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libdnet.rb b/Formula/lib/libdnet.rb index 544a85af858c0..72b4c11cc03ba 100644 --- a/Formula/lib/libdnet.rb +++ b/Formula/lib/libdnet.rb @@ -24,15 +24,14 @@ class Libdnet < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build def install # autoreconf to get '.dylib' extension on shared lib ENV.append_path "ACLOCAL_PATH", "config" - system "autoreconf", "-ivf" + system "autoreconf", "--force", "--install", "--verbose" - args = std_configure_args - ["--disable-debug"] - system "./configure", *args, "--mandir=#{man}", "--disable-check" + system "./configure", "--mandir=#{man}", "--disable-check", *std_configure_args system "make", "install" end From 642ce2f8590572054334b635ac08d9d56ee11c98 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:08:15 -0500 Subject: [PATCH 02/25] libdom: migrate to `pkgconf` --- Formula/lib/libdom.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/lib/libdom.rb b/Formula/lib/libdom.rb index c82b3044e79f8..ce7fbc06c0d2f 100644 --- a/Formula/lib/libdom.rb +++ b/Formula/lib/libdom.rb @@ -20,7 +20,7 @@ class Libdom < Formula end depends_on "netsurf-buildsystem" => :build - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libhubbub" depends_on "libwapcaplet" uses_from_macos "expat" @@ -47,8 +47,8 @@ def install } C - pkg_config_flags = shell_output("pkg-config --cflags --libs libdom").chomp.split - system ENV.cc, "test.c", "-o", "test", *pkg_config_flags + flags = shell_output("pkgconf --cflags --libs libdom").chomp.split + system ENV.cc, "test.c", "-o", "test", *flags system "./test" end end From af4e9d411d3fd314503e5b0f8d3fcdd4dd73b509 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:08:29 -0500 Subject: [PATCH 03/25] libdpp: migrate to `pkgconf` --- Formula/lib/libdpp.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libdpp.rb b/Formula/lib/libdpp.rb index bc913ab7873dd..081879e6a7577 100644 --- a/Formula/lib/libdpp.rb +++ b/Formula/lib/libdpp.rb @@ -17,7 +17,7 @@ class Libdpp < Formula depends_on "cmake" => :build depends_on "openssl@3" depends_on "opus" - depends_on "pkg-config" + depends_on "pkgconf" uses_from_macos "zlib" From f13854160334b67c7078eea0e58d0e48903ef3cf Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:09:04 -0500 Subject: [PATCH 04/25] libdrawtext: migrate to `pkgconf` --- Formula/lib/libdrawtext.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libdrawtext.rb b/Formula/lib/libdrawtext.rb index 35a526bb322a8..59ecd045c52e3 100644 --- a/Formula/lib/libdrawtext.rb +++ b/Formula/lib/libdrawtext.rb @@ -18,7 +18,7 @@ class Libdrawtext < Formula sha256 cellar: :any, big_sur: "2f01264e3b9729a123e24c71078c5b7b5c2189c2a2ed2a8481763080ed213ce1" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "freetype" on_linux do From d607dd70f9c4218c170595e20f63c14150c1173f Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:09:15 -0500 Subject: [PATCH 05/25] libdrm: migrate to `pkgconf` --- Formula/lib/libdrm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libdrm.rb b/Formula/lib/libdrm.rb index 28e5dee967e86..db47acca3599b 100644 --- a/Formula/lib/libdrm.rb +++ b/Formula/lib/libdrm.rb @@ -17,7 +17,7 @@ class Libdrm < Formula depends_on "docutils" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libpciaccess" depends_on :linux From 3cd2aa0442396825f39695061b528d2b01b69a78 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:09:52 -0500 Subject: [PATCH 06/25] libdv: migrate to `pkgconf` --- Formula/lib/libdv.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Formula/lib/libdv.rb b/Formula/lib/libdv.rb index df8d5f3148423..3b01df1d413de 100644 --- a/Formula/lib/libdv.rb +++ b/Formula/lib/libdv.rb @@ -30,7 +30,7 @@ class Libdv < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build end # remove SDL1 dependency by force @@ -44,18 +44,17 @@ def install # This flag is the preferred method over what macports uses. # See the apple docs: https://cl.ly/2HeF bottom of the "Finding Imported Symbols" section ENV.append "LDFLAGS", "-undefined dynamic_lookup" - system "autoreconf", "-fvi" + system "autoreconf", "--force", "--install", "--verbose" end # Fix compile with newer Clang ENV.append_to_cflags "-Wno-implicit-function-declaration" if DevelopmentTools.clang_build_version >= 1403 - system "./configure", "--disable-dependency-tracking", - "--prefix=#{prefix}", + system "./configure", "--disable-asm", "--disable-gtktest", "--disable-gtk", - "--disable-asm", - "--disable-sdltest" + "--disable-sdltest", + *std_configure_args system "make", "install" end end From 758b807c77a9d158abb58c77d8b72d4f89ad1e8a Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:10:21 -0500 Subject: [PATCH 07/25] libdvdnav: migrate to `pkgconf` --- Formula/lib/libdvdnav.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libdvdnav.rb b/Formula/lib/libdvdnav.rb index 03b916c799891..b270d828b7c13 100644 --- a/Formula/lib/libdvdnav.rb +++ b/Formula/lib/libdvdnav.rb @@ -41,13 +41,12 @@ class Libdvdnav < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libdvdread" def install - system "autoreconf", "-if" if build.head? - system "./configure", "--disable-dependency-tracking", - "--prefix=#{prefix}" + system "autoreconf", "--force", "--install", "--verbose" if build.head? + system "./configure", *std_configure_args system "make", "install" end end From e6413b57b351b2ae62a0b3698adf4a8789a5ad4b Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:10:31 -0500 Subject: [PATCH 08/25] libebur128: migrate to `pkgconf` --- Formula/lib/libebur128.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libebur128.rb b/Formula/lib/libebur128.rb index 47f45abd277fc..6229cf2b90518 100644 --- a/Formula/lib/libebur128.rb +++ b/Formula/lib/libebur128.rb @@ -21,7 +21,7 @@ class Libebur128 < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "speex" def install From e37c16505235ee52e564fde31b902f94d4cbdcf5 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:34:21 -0500 Subject: [PATCH 09/25] libepoxy: migrate to `pkgconf` --- Formula/lib/libepoxy.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Formula/lib/libepoxy.rb b/Formula/lib/libepoxy.rb index 1d7b9fce6b490..80a3616a9d9cf 100644 --- a/Formula/lib/libepoxy.rb +++ b/Formula/lib/libepoxy.rb @@ -28,7 +28,7 @@ class Libepoxy < Formula depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build on_linux do depends_on "freeglut" @@ -42,7 +42,6 @@ def install test do (testpath/"test.c").write <<~C - #include #ifdef OS_MAC #include From 1e7a038ece5e8d710033985c0f1f55caf1ed32bd Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:34:43 -0500 Subject: [PATCH 10/25] libestr: migrate to `pkgconf` --- Formula/lib/libestr.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/lib/libestr.rb b/Formula/lib/libestr.rb index 64783a91e5a03..18407e3cbe3e4 100644 --- a/Formula/lib/libestr.rb +++ b/Formula/lib/libestr.rb @@ -27,7 +27,7 @@ class Libestr < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "6f131de3ed214869ab11a430e48f7e006d8b4ae1c181413f0d60aa9da85f4599" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build # Fix -flat_namespace being used on Big Sur and later. patch do @@ -36,7 +36,7 @@ class Libestr < Formula end def install - system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" + system "./configure", *std_configure_args system "make" system "make", "install" end From 7bfe651e65ce842ff0cf3f434d622bcc345c3207 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:35:23 -0500 Subject: [PATCH 11/25] libetonyek: migrate to `pkgconf` --- Formula/lib/libetonyek.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libetonyek.rb b/Formula/lib/libetonyek.rb index 6314c928db19f..92af60cf31c94 100644 --- a/Formula/lib/libetonyek.rb +++ b/Formula/lib/libetonyek.rb @@ -22,7 +22,7 @@ class Libetonyek < Formula depends_on "boost" => :build depends_on "glm" => :build depends_on "mdds" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "librevenge" uses_from_macos "libxml2" From 0e4475f396f6164766b65db26ae4fdc1cddf2999 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:35:45 -0500 Subject: [PATCH 12/25] libetpan: migrate to `pkgconf` --- Formula/lib/libetpan.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libetpan.rb b/Formula/lib/libetpan.rb index 074c3bae5062b..d6a2e150dec70 100644 --- a/Formula/lib/libetpan.rb +++ b/Formula/lib/libetpan.rb @@ -46,7 +46,7 @@ class Libetpan < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "openssl@3" end From 151804ad59742434c8ef6a24a36ca38c67b860f4 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:36:07 -0500 Subject: [PATCH 13/25] libevent: migrate to `pkgconf` --- Formula/lib/libevent.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libevent.rb b/Formula/lib/libevent.rb index 7d4cc91506897..78af620264048 100644 --- a/Formula/lib/libevent.rb +++ b/Formula/lib/libevent.rb @@ -27,14 +27,12 @@ class Libevent < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "openssl@3" def install system "./autogen.sh" - system "./configure", "--disable-dependency-tracking", - "--disable-debug-mode", - "--prefix=#{prefix}" + system "./configure", "--disable-debug-mode", *std_configure_args system "make" system "make", "install" end From ff1f8b390c35e059b52323b1efd93716f53c430d Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:36:27 -0500 Subject: [PATCH 14/25] libewf: migrate to `pkgconf` --- Formula/lib/libewf.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Formula/lib/libewf.rb b/Formula/lib/libewf.rb index 309d09b39dd91..1ca119d174100 100644 --- a/Formula/lib/libewf.rb +++ b/Formula/lib/libewf.rb @@ -32,7 +32,7 @@ class Libewf < Formula depends_on "libtool" => :build end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "openssl@3" uses_from_macos "bzip2" @@ -44,14 +44,12 @@ def install system "./autogen.sh" end - args = %W[ - --disable-dependency-tracking + args = %w[ --disable-silent-rules - --prefix=#{prefix} --with-libfuse=no ] - system "./configure", *args + system "./configure", *args, *std_configure_args system "make", "install" end From b1d13f3448be89a479b10d999a369eb8ed0b7216 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:36:50 -0500 Subject: [PATCH 15/25] libexosip: migrate to `pkgconf` --- Formula/lib/libexosip.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/lib/libexosip.rb b/Formula/lib/libexosip.rb index 8f6d179130424..96d55ad14f28a 100644 --- a/Formula/lib/libexosip.rb +++ b/Formula/lib/libexosip.rb @@ -25,7 +25,7 @@ class Libexosip < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "07fe4531bd26a4c6fabb8833e55dc9b955c3f995c5c024177b9a9e3800785782" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "c-ares" depends_on "libosip" depends_on "openssl@3" @@ -38,7 +38,7 @@ def install ENV.append "LDFLAGS", "-framework CoreFoundation -framework CoreServices " \ "-framework Security" end - system "./configure", *std_configure_args, "--disable-silent-rules" + system "./configure", "--disable-silent-rules", *std_configure_args system "make", "install" end From fcd6e038f2467faa9804fe51bd91251cca21518d Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:37:06 -0500 Subject: [PATCH 16/25] libextractor: migrate to `pkgconf` --- Formula/lib/libextractor.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libextractor.rb b/Formula/lib/libextractor.rb index a3f49594df8b2..0a59ec6277c88 100644 --- a/Formula/lib/libextractor.rb +++ b/Formula/lib/libextractor.rb @@ -17,7 +17,7 @@ class Libextractor < Formula sha256 x86_64_linux: "f3cbd363b695aecf683d92a8b56aa5cb9a8d7e3d81b6190892c8393de7f4d648" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libtool" uses_from_macos "zlib" @@ -27,9 +27,7 @@ class Libextractor < Formula def install ENV.deparallelize - system "./configure", "--disable-silent-rules", - "--disable-dependency-tracking", - "--prefix=#{prefix}" + system "./configure", "--disable-silent-rules", *std_configure_args system "make", "install" end From 54a89ce2a48d575866985635d4336c6117006e92 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:37:58 -0500 Subject: [PATCH 17/25] libfido2: migrate to `pkgconf` --- Formula/lib/libfido2.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Formula/lib/libfido2.rb b/Formula/lib/libfido2.rb index f9b4d9238bb82..a7841abaa6804 100644 --- a/Formula/lib/libfido2.rb +++ b/Formula/lib/libfido2.rb @@ -18,7 +18,7 @@ class Libfido2 < Formula depends_on "cmake" => :build depends_on "mandoc" => :build - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "libcbor" depends_on "openssl@3" @@ -29,11 +29,9 @@ class Libfido2 < Formula end def install - args = std_cmake_args + args = OS.linux? ? ["-DUDEV_RULES_DIR=#{lib}/udev/rules.d"] : [] - args << "-DUDEV_RULES_DIR=#{lib}/udev/rules.d" if OS.linux? - - system "cmake", "-S", ".", "-B", ".", *args + system "cmake", "-S", ".", "-B", ".", *args, *std_cmake_args system "cmake", "--build", "." system "cmake", "--build", ".", "--target", "man_symlink_html" system "cmake", "--build", ".", "--target", "man_symlink" @@ -61,8 +59,8 @@ def install } EOF - pkg_config_flags = shell_output("pkg-config --cflags --libs libfido2").chomp.split - system ENV.cc, "test.c", "-I#{include}", "-o", "test", *pkg_config_flags + flags = shell_output("pkgconf --cflags --libs libfido2").chomp.split + system ENV.cc, "test.c", "-I#{include}", "-o", "test", *flags system "./test" end end From d0a3627ee3565cdcc71594bee2b0335e12990891 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:38:06 -0500 Subject: [PATCH 18/25] libfishsound: migrate to `pkgconf` --- Formula/lib/libfishsound.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libfishsound.rb b/Formula/lib/libfishsound.rb index 0bb2ec988f7a1..5a8e3ad021402 100644 --- a/Formula/lib/libfishsound.rb +++ b/Formula/lib/libfishsound.rb @@ -30,7 +30,7 @@ class Libfishsound < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "5db56944c47f7f4084a4645ef252841be006ad54ee48fb55530eda206e6732c3" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libvorbis" # Fix -flat_namespace being used on Big Sur and later. From 0841b7bc0c6d6ae13d1bb27b79b7d84850b20fef Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:38:28 -0500 Subject: [PATCH 19/25] libfixbuf: migrate to `pkgconf` --- Formula/lib/libfixbuf.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/lib/libfixbuf.rb b/Formula/lib/libfixbuf.rb index 7a2e1059826a5..4d31281ae7a34 100644 --- a/Formula/lib/libfixbuf.rb +++ b/Formula/lib/libfixbuf.rb @@ -23,7 +23,7 @@ class Libfixbuf < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "b2c6294855ef75ae5b347c818c9caf938640f7dc128a52fca9db6ed7b079c71b" end - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "glib" depends_on "openssl@3" @@ -57,8 +57,8 @@ def install } C - pkg_config_flags = shell_output("pkg-config --cflags --libs libfixbuf").chomp.split - system ENV.cc, "test.c", "-o", "test", *pkg_config_flags + flags = shell_output("pkgconf --cflags --libs libfixbuf").chomp.split + system ENV.cc, "test.c", "-o", "test", *flags system "./test" end end From 9ddeea5e30dc77676c157a0e8a40b62d1b68a180 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:39:19 -0500 Subject: [PATCH 20/25] libfixposix: migrate to `pkgconf` --- Formula/lib/libfixposix.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Formula/lib/libfixposix.rb b/Formula/lib/libfixposix.rb index 03475bc1499d2..9ef636a9d3b21 100644 --- a/Formula/lib/libfixposix.rb +++ b/Formula/lib/libfixposix.rb @@ -23,13 +23,11 @@ class Libfixposix < Formula depends_on "autoconf" => :build depends_on "automake" => :build depends_on "libtool" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build def install - system "autoreconf", "-fvi" - system "./configure", "--disable-dependency-tracking", - "--disable-silent-rules", - "--prefix=#{prefix}" + system "autoreconf", "--force", "--install", "--verbose" + system "./configure", "--disable-silent-rules", *std_configure_args system "make", "install" end From 0c97836bdb5f5685bfadcde959cda0d26b6dacd5 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:39:36 -0500 Subject: [PATCH 21/25] libfontenc: migrate to `pkgconf` --- Formula/lib/libfontenc.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libfontenc.rb b/Formula/lib/libfontenc.rb index 40b4db52c77be..04e3d477b29a7 100644 --- a/Formula/lib/libfontenc.rb +++ b/Formula/lib/libfontenc.rb @@ -17,7 +17,7 @@ class Libfontenc < Formula end depends_on "font-util" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "util-macros" => :build depends_on "xorgproto" => :build @@ -25,14 +25,12 @@ class Libfontenc < Formula def install args = %W[ - --prefix=#{prefix} --sysconfdir=#{etc} --localstatedir=#{var} - --disable-dependency-tracking --disable-silent-rules ] - system "./configure", *args + system "./configure", *args, *std_configure_args system "make" system "make", "install" end From 790be6bc5ae61458d7e26af32c48bae89ffab41f Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:39:48 -0500 Subject: [PATCH 22/25] libfreefare: migrate to `pkgconf` --- Formula/lib/libfreefare.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libfreefare.rb b/Formula/lib/libfreefare.rb index d405a9e2c16ea..90c8c1cebc246 100644 --- a/Formula/lib/libfreefare.rb +++ b/Formula/lib/libfreefare.rb @@ -19,7 +19,7 @@ class Libfreefare < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "d3837eb7894980557e16a097e05bc2fa8d42429177f30359166820cca640cc52" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "libnfc" depends_on "openssl@3" From 16910132092d9dcb3911f70fd3c94c5d7e87f4d4 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:40:41 -0500 Subject: [PATCH 23/25] libftdi: migrate to `pkgconf` --- Formula/lib/libftdi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/lib/libftdi.rb b/Formula/lib/libftdi.rb index 0a284a20d7b80..18d9c44ed2b44 100644 --- a/Formula/lib/libftdi.rb +++ b/Formula/lib/libftdi.rb @@ -27,7 +27,7 @@ class Libftdi < Formula end depends_on "cmake" => :build - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "swig" => :build depends_on "boost" depends_on "confuse" From db02fd8fcde4d0e97dcd2dd707bb55c82914dcf3 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:41:04 -0500 Subject: [PATCH 24/25] libgda: migrate to `pkgconf` --- Formula/lib/libgda.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/lib/libgda.rb b/Formula/lib/libgda.rb index b867ea7402aa0..ada1f7178354a 100644 --- a/Formula/lib/libgda.rb +++ b/Formula/lib/libgda.rb @@ -22,7 +22,7 @@ class Libgda < Formula depends_on "intltool" => :build depends_on "meson" => :build depends_on "ninja" => :build - depends_on "pkg-config" => [:build, :test] + depends_on "pkgconf" => [:build, :test] depends_on "vala" => :build depends_on "glib" depends_on "iso-codes" @@ -69,7 +69,7 @@ def install test do cp pkgshare/"example.c", testpath - flags = shell_output("pkg-config --cflags --libs libgda-#{version.major_minor}").chomp.split + flags = shell_output("pkgconf --cflags --libs libgda-#{version.major_minor}").chomp.split system ENV.cc, "example.c", "-o", "example", *flags assert_match <<~EOS, shell_output("./example") ------+---------+--------- From 45a8173d279fb917d38cacb12dc3e171ef13ef47 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 25 Nov 2024 19:43:18 -0500 Subject: [PATCH 25/25] libfs: migrate to `pkgconf` --- Formula/lib/libfs.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Formula/lib/libfs.rb b/Formula/lib/libfs.rb index eee87a61a2fa2..776ac9073361a 100644 --- a/Formula/lib/libfs.rb +++ b/Formula/lib/libfs.rb @@ -16,20 +16,18 @@ class Libfs < Formula sha256 cellar: :any_skip_relocation, x86_64_linux: "c17d8ae2548594b5aae02734f0c2804858754e00f2e1b2dcc38d5bc86086aa5e" end - depends_on "pkg-config" => :build + depends_on "pkgconf" => :build depends_on "xtrans" => :build depends_on "xorgproto" def install args = %W[ - --prefix=#{prefix} --sysconfdir=#{etc} --localstatedir=#{var} - --disable-dependency-tracking --disable-silent-rules ] - system "./configure", *args + system "./configure", *args, *std_configure_args system "make" system "make", "install" end