Skip to content

firefoxpwa: use openssl@3, bzip2: add pkgconfig file #113581

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.

Sign up for GitHub

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

Closed
cho-m wants to merge 2 commits into from
Closed

firefoxpwa: use openssl@3, bzip2: add pkgconfig file #113581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e07eb3
firefoxpwa: use `openssl@3`
cho-m Oct 20, 2022
4fad972
bzip2: add pkgconfig file
cho-m Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions Formula/bzip2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,30 @@ def install
inreplace "Makefile", "$(PREFIX)/man", "$(PREFIX)/share/man"

system "make", "install", "PREFIX=#{prefix}"
return if OS.mac?

if OS.linux?
# Install shared libraries
system "make", "-f", "Makefile-libbz2_so", "clean"
system "make", "-f", "Makefile-libbz2_so"
lib.install "libbz2.so.#{version}", "libbz2.so.#{version.major_minor}"
lib.install_symlink "libbz2.so.#{version}" => "libbz2.so.#{version.major}"
lib.install_symlink "libbz2.so.#{version}" => "libbz2.so"
end
# Install shared libraries
system "make", "-f", "Makefile-libbz2_so", "clean"
system "make", "-f", "Makefile-libbz2_so"
lib.install "libbz2.so.#{version}", "libbz2.so.#{version.major_minor}"
lib.install_symlink "libbz2.so.#{version}" => "libbz2.so.#{version.major}"
lib.install_symlink "libbz2.so.#{version}" => "libbz2.so"

# Create pkgconfig file based on 1.1.x repository.
# https://gitlab.com/bzip2/bzip2/-/blob/master/bzip2.pc.in
(lib/"pkgconfig/bzip2.pc").write <<~EOS
prefix=#{opt_prefix}
exec_prefix=${prefix}
bindir=${exec_prefix}/bin
libdir=${exec_prefix}/lib
includedir=${prefix}/include

Name: bzip2
Description: Lossless, block-sorting data compression
Version: #{version}
Libs: -L${libdir} -lbz2
Cflags: -I${includedir}
EOS
end

test do
Expand Down
3 changes: 2 additions & 1 deletion Formula/firefoxpwa.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ class Firefoxpwa < Formula

on_linux do
depends_on "pkg-config" => :build
depends_on "[email protected]"
depends_on "bzip2" # not used on macOS
depends_on "openssl@3"
end

def install
Expand Down