Skip to content

Commit f9ff777

Browse files
authored
Merge pull request Homebrew#198411 from Homebrew/pkgconf-migrations-v-3
v*: migrate to `pkgconf` (part 3)
2 parents 7f7b036 + f042943 commit f9ff777

File tree

9 files changed

+10
-19
lines changed

9 files changed

+10
-19
lines changed

Formula/v/volk.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ class Volk < Formula
1818
end
1919

2020
depends_on "cmake" => :build
21-
depends_on "pkg-config" => :build
21+
depends_on "pkgconf" => :build
2222
depends_on "cpu_features"
2323
depends_on "orc"
2424
depends_on "[email protected]"
2525

26-
fails_with gcc: "5" # https://github.com/gnuradio/volk/issues/375
27-
2826
resource "mako" do
2927
url "https://files.pythonhosted.org/packages/67/03/fb5ba97ff65ce64f6d35b582aacffc26b693a98053fa831ab43a437cbddb/Mako-1.3.5.tar.gz"
3028
sha256 "48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc"

Formula/v/volta.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@ class Volta < Formula
2222
sha256 cellar: :any_skip_relocation, x86_64_linux: "1e50806022ce887eb58b2880aff109e3a0f0a63827d9bf8ea3c543287500230b"
2323
end
2424

25+
depends_on "pkgconf" => :build
2526
depends_on "rust" => :build
2627

2728
uses_from_macos "bzip2"
2829

29-
on_linux do
30-
depends_on "pkg-config" => :build
31-
end
32-
3330
def install
3431
system "cargo", "install", *std_cargo_args
3532
generate_completions_from_executable(bin/"volta", "completions")

Formula/v/vorbis-tools.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class VorbisTools < Formula
3030
sha256 cellar: :any_skip_relocation, x86_64_linux: "d5bf7cdf6990819e485ad13b82e4206b9b9d53864533b2015361893e1611c494"
3131
end
3232

33-
depends_on "pkg-config" => :build
33+
depends_on "pkgconf" => :build
3434
depends_on "flac"
3535
depends_on "libao"
3636
depends_on "libogg"

Formula/v/votca.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Votca < Formula
1515
end
1616

1717
depends_on "cmake" => :build
18-
depends_on "pkg-config" => :build
18+
depends_on "pkgconf" => :build
1919
depends_on "boost"
2020
depends_on "eigen"
2121
depends_on "fftw"

Formula/v/vroom.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ class Vroom < Formula
1919
end
2020

2121
depends_on "cxxopts" => :build
22-
depends_on "pkg-config" => :build
22+
depends_on "pkgconf" => :build
2323
depends_on "rapidjson" => :build
2424
depends_on "asio"
2525
depends_on macos: :mojave # std::optional C++17 support
2626
depends_on "openssl@3"
2727

28-
fails_with gcc: "5"
29-
3028
def install
3129
# fixes https://github.com/VROOM-Project/vroom/issues/997 , remove in version > 1.13.0
3230
inreplace "src/main.cpp", "throw cxxopts::OptionException", "throw cxxopts::exceptions::parsing"

Formula/v/vsce.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Vsce < Formula
2626
depends_on "node"
2727

2828
on_linux do
29-
depends_on "pkg-config" => :build
29+
depends_on "pkgconf" => :build
3030
depends_on "glib"
3131
depends_on "libsecret"
3232
end

Formula/v/vstr.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,15 @@ class Vstr < Formula
2828
sha256 cellar: :any_skip_relocation, x86_64_linux: "8346f2277202db06584db705dcf754a00ca364c547791d911e7c3395072b1b6e"
2929
end
3030

31-
depends_on "pkg-config" => :build
31+
depends_on "pkgconf" => :build
3232

3333
# Fix flat namespace usage on macOS.
3434
patch :DATA
3535

3636
def install
3737
ENV.append "CFLAGS", "--std=gnu89"
3838
ENV["ac_cv_func_stat64"] = "no" if Hardware::CPU.arm?
39-
system "./configure", "--disable-dependency-tracking",
40-
"--prefix=#{prefix}",
41-
"--mandir=#{man}"
39+
system "./configure", "--mandir=#{man}", *std_configure_args
4240
system "make", "install"
4341
end
4442

Formula/v/vtclock.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class Vtclock < Formula
2323
sha256 cellar: :any_skip_relocation, x86_64_linux: "8aaffb5793d37cea515c7e1c1d428225dcd58cb898d088f1113fadb76b9fd0e7"
2424
end
2525

26-
depends_on "pkg-config" => :build
26+
depends_on "pkgconf" => :build
2727
uses_from_macos "ncurses"
2828

2929
def install

Formula/v/vte3.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Vte3 < Formula
1818
depends_on "gobject-introspection" => :build
1919
depends_on "meson" => :build
2020
depends_on "ninja" => :build
21-
depends_on "pkg-config" => [:build, :test]
21+
depends_on "pkgconf" => [:build, :test]
2222
depends_on "vala" => :build
2323

2424
depends_on "at-spi2-core"

0 commit comments

Comments
 (0)