Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i*: migrate to pkgconf (part 1) #198685

Merged
merged 10 commits into from
Nov 23, 2024
Merged
2 changes: 1 addition & 1 deletion Formula/i/i686-elf-binutils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class I686ElfBinutils < Formula
sha256 x86_64_linux: "261dda7591614a6c0ff80dff4f7b85b1b746c97dc5510a695fae6f894559e6f9"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "zstd"

uses_from_macos "zlib"
Expand Down
3 changes: 2 additions & 1 deletion Formula/i/iamb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ class Iamb < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "f77262d3d6396f267d57ae41fa0d76d023dc5960ebb0eea743ebff4b9ea7f245"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "rust" => :build

uses_from_macos "sqlite", since: :ventura # requires sqlite3_error_offset

on_linux do
Expand Down
2 changes: 1 addition & 1 deletion Formula/i/ibex.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Ibex < Formula
depends_on "bison" => :build
depends_on "cmake" => :build
depends_on "flex" => :build
depends_on "pkg-config" => [:build, :test]
depends_on "pkgconf" => [:build, :test]
depends_on arch: :x86_64

uses_from_macos "zlib"
Expand Down
8 changes: 3 additions & 5 deletions Formula/i/icecast.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Icecast < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "0a5ea433670e7f6a02c9ff502c6d65c56d6ea5c5e65c3eac418d3da2cf05cac2"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build

depends_on "libogg"
depends_on "libvorbis"
Expand All @@ -44,7 +44,7 @@ def install
# HACK: Avoid linking brewed `curl` as side effect of `using: :homebrew_curl`
args << "--with-curl-config=/usr/bin/curl-config" if OS.mac?

system "./configure", *std_configure_args, *args
system "./configure", *args, *std_configure_args
system "make", "install"
end

Expand All @@ -60,9 +60,7 @@ def post_install
cp etc/"icecast.xml", testpath/"icecast.xml"
inreplace testpath/"icecast.xml", "<port>8000</port>", "<port>#{port}</port>"

pid = fork do
exec "icecast", "-c", testpath/"icecast.xml", "2>", "/dev/null"
end
pid = spawn "icecast", "-c", testpath/"icecast.xml", err: "/dev/null"
sleep 3

begin
Expand Down
8 changes: 3 additions & 5 deletions Formula/i/icecream.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Icecream < Formula
depends_on "automake" => :build
depends_on "docbook2x" => :build
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "libarchive"
depends_on "lzo"
depends_on "zstd"
Expand All @@ -34,15 +34,13 @@ class Icecream < Formula
end

def install
args = %W[
--disable-dependency-tracking
args = %w[
--disable-silent-rules
--prefix=#{prefix}
--enable-clang-wrappers
]

system "./autogen.sh"
system "./configure", *args
system "./configure", *args, *std_configure_args
system "make", "install"

# Manually install scheduler property list
Expand Down
6 changes: 2 additions & 4 deletions Formula/i/icemon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Icemon < Formula

depends_on "cmake" => :build
depends_on "extra-cmake-modules" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "sphinx-doc" => :build

depends_on "icecream"
Expand All @@ -39,10 +39,8 @@ class Icemon < Formula
depends_on "libcap-ng"
end

fails_with gcc: "5"

def install
args = "-DECM_DIR=#{Formula["extra-cmake-modules"].opt_share}/ECM/cmake"
args = ["-DECM_DIR=#{Formula["extra-cmake-modules"].opt_share}/ECM/cmake"]
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
system "cmake", "--build", "build"
system "cmake", "--install", "build"
Expand Down
4 changes: 2 additions & 2 deletions Formula/i/icon-naming-utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class IconNamingUtils < Formula
sha256 cellar: :any_skip_relocation, x86_64_linux: "2808ba5e1f6d084d4f424e084ead17462349b6b2c5d60e5162ecd633c7e3be2f"
end

depends_on "pkg-config" => :test
depends_on "pkgconf" => :test

uses_from_macos "perl"

Expand Down Expand Up @@ -154,7 +154,7 @@ def install
end

test do
assert_equal libexec.to_s, shell_output("pkg-config --variable=program_path icon-naming-utils").chomp
assert_equal libexec.to_s, shell_output("pkgconf --variable=program_path icon-naming-utils").chomp
assert_match "Usage: icon-name-mapping", shell_output(libexec/"icon-name-mapping", 1)
end
end
6 changes: 3 additions & 3 deletions Formula/i/ideviceinstaller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ class Ideviceinstaller < Formula
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "libimobiledevice"
depends_on "libplist"
depends_on "libzip"

def install
system "./autogen.sh", *std_configure_args if build.head?
system "./configure", *std_configure_args if build.stable?
configure = build.head? ? "./autogen.sh" : "./configure"
system configure, *std_configure_args
system "make", "install"
end

Expand Down
2 changes: 1 addition & 1 deletion Formula/i/ifuse.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Ifuse < Formula
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "glib"
depends_on "libfuse@2"
depends_on "libimobiledevice"
Expand Down
4 changes: 2 additions & 2 deletions Formula/i/imagemagick.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Imagemagick < Formula
sha256 x86_64_linux: "0cd399334918d6af885294f07c50e90baf9a1b4cddc5a2133bb6e6f8a84455db"
end

depends_on "pkg-config" => :build
depends_on "pkgconf" => :build
depends_on "fontconfig"
depends_on "freetype"
depends_on "ghostscript"
Expand Down Expand Up @@ -95,7 +95,7 @@ def install
]
end

system "./configure", *std_configure_args, *args
system "./configure", *args, *std_configure_args
system "make", "install"
end

Expand Down
Loading