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.

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

perl: depend on libxcrypt #108663

Closed
wants to merge 19 commits into from
+27 −13
Closed

perl: depend on libxcrypt #108663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bc6fdba
perl: depend on libxcrypt and use opt_prefix
danielnachun Aug 23, 2022
10e80f5
collectd: revision bump
danielnachun Sep 1, 2022
ef4dc2c
freeradius-server: revision bump
danielnachun Sep 1, 2022
7360589
git-svn: revision bump
danielnachun Sep 1, 2022
1cb265d
gnumeric: revision bump
danielnachun Sep 1, 2022
2f3b5bf
grokj2k: revision bump
danielnachun Sep 1, 2022
55c7af7
irssi: revision bump
danielnachun Sep 1, 2022
cb629b6
mhonarc: revision bump
danielnachun Sep 1, 2022
273b834
pidgin: revision bump
danielnachun Sep 1, 2022
acaac3c
postgresql@10: revision bump
danielnachun Sep 1, 2022
49ceb20
postgresql@11: revision bump
danielnachun Sep 1, 2022
b8e1ac6
postgresql@12: revision bump
danielnachun Sep 1, 2022
e07c6a8
postgresql@13: revision bump
danielnachun Sep 1, 2022
0a0af18
postgresql@14: revision bump
danielnachun Sep 1, 2022
f1b4922
rxvt-unicode: revision bump
danielnachun Sep 1, 2022
1b2e0ea
uwsgi: revision bump
danielnachun Sep 1, 2022
25c0655
v: revision bump
danielnachun Sep 1, 2022
72eb1d4
vim: revision bump
danielnachun Sep 1, 2022
3004b24
weechat: revision bump
danielnachun Sep 1, 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
2 changes: 1 addition & 1 deletion Formula/collectd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class Collectd < Formula
desc "Statistics collection and monitoring daemon"
homepage "https://collectd.org/"
license "MIT"
revision 3
revision 4

stable do
url "https://collectd.org/files/collectd-5.12.0.tar.bz2"
Expand Down
2 changes: 1 addition & 1 deletion Formula/freeradius-server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class FreeradiusServer < Formula
desc "High-performance and highly configurable RADIUS server"
homepage "https://freeradius.org/"
license all_of: ["GPL-2.0-or-later", "LGPL-2.1-or-later"]
revision 1
revision 2
head "https://github.com/FreeRADIUS/freeradius-server.git", branch: "master"

stable do
Expand Down
1 change: 1 addition & 0 deletions Formula/git-svn.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class GitSvn < Formula
url "https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.37.3.tar.xz"
sha256 "814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a"
license "GPL-2.0-only"
revision 1
head "https://github.com/git/git.git", branch: "master"

livecheck do
Expand Down
1 change: 1 addition & 0 deletions Formula/gnumeric.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Gnumeric < Formula
url "https://download.gnome.org/sources/gnumeric/1.12/gnumeric-1.12.52.tar.xz"
sha256 "73cf73049a22a1d828506275b2c9378ec37c5ff37b68bb1f2f494f0d6400823b"
license any_of: ["GPL-3.0-only", "GPL-2.0-only"]
revision 1

bottle do
sha256 arm64_monterey: "6cb714f54fe2d981e185aadaef062f144dc87578c70cf226b08e2f2cbcd41583"
Expand Down
1 change: 1 addition & 0 deletions Formula/grokj2k.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Grokj2k < Formula
url "https://github.com/GrokImageCompression/grok/archive/v9.7.1.tar.gz"
sha256 "a7d433dca92b035349ef8203eb44cb6d0b2c9b41aecd2d12872a9ca2761e0606"
license "AGPL-3.0-or-later"
revision 1
head "https://github.com/GrokImageCompression/grok.git", branch: "master"

livecheck do
Expand Down
2 changes: 1 addition & 1 deletion Formula/irssi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Irssi < Formula
url "https://github.com/irssi/irssi/releases/download/1.2.3/irssi-1.2.3.tar.xz"
sha256 "a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f"
license "GPL-2.0-or-later"
revision 1
revision 2

# This formula uses a file from a GitHub release, so we check the latest
# release version instead of Git tags.
Expand Down
2 changes: 1 addition & 1 deletion Formula/mhonarc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Mhonarc < Formula
url "https://www.mhonarc.org/release/MHonArc/tar/MHonArc-2.6.19.tar.bz2"
sha256 "08912eae8323997b940b94817c83149d2ee3ed11d44f29b3ef4ed2a39de7f480"
license "GPL-2.0-or-later"
revision 2
revision 3

livecheck do
url :homepage
Expand Down
16 changes: 9 additions & 7 deletions Formula/perl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Perl < Formula
url "https://www.cpan.org/src/5.0/perl-5.34.0.tar.xz"
sha256 "82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded"
license any_of: ["Artistic-1.0-Perl", "GPL-1.0-or-later"]
revision 1
carlocab marked this conversation as resolved.
Show resolved Hide resolved
head "https://github.com/perl/perl5.git", branch: "blead"

livecheck do
Expand All @@ -25,26 +26,27 @@ class Perl < Formula
depends_on "gdbm"

uses_from_macos "expat"
uses_from_macos "libxcrypt"

# Prevent site_perl directories from being removed
skip_clean "lib/perl5/site_perl"

def install
args = %W[
-des
-Dprefix=#{prefix}
-Dprivlib=#{lib}/perl5/#{version}
-Dsitelib=#{lib}/perl5/site_perl/#{version}
-Dotherlibdirs=#{HOMEBREW_PREFIX}/lib/perl5/site_perl/#{version}
-Dinstallprefix=#{prefix}
-Dprefix=#{opt_prefix}
-Dprivlib=#{opt_lib}/perl5/#{version.major_minor}
-Dsitelib=#{opt_lib}/perl5/site_perl/#{version.major_minor}
-Dotherlibdirs=#{HOMEBREW_PREFIX}/lib/perl5/site_perl/#{version.major_minor}
-Dperlpath=#{opt_bin}/perl
-Dstartperl=#!#{opt_bin}/perl
-Dman1dir=#{man1}
-Dman3dir=#{man3}
-Dman1dir=#{opt_share}/man/man1
-Dman3dir=#{opt_share}/man/man3
-Duseshrplib
-Duselargefiles
-Dusethreads
Comment on lines -35 to 48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cho-m, it'd be useful if you could take a look at this since you tried doing something similar before.

]
args << "-Dsed=/usr/bin/sed" if OS.mac?

args << "-Dusedevel" if build.head?

Expand Down
1 change: 1 addition & 0 deletions Formula/pidgin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Pidgin < Formula
url "https://downloads.sourceforge.net/project/pidgin/Pidgin/2.14.10/pidgin-2.14.10.tar.bz2"
sha256 "454b1b928bc6bcbb183353af30fbfde5595f2245a3423a1a46e6c97a2df22810"
license "GPL-2.0-or-later"
revision 1

livecheck do
url "https://sourceforge.net/projects/pidgin/files/Pidgin/"
Expand Down
1 change: 1 addition & 0 deletions Formula/postgresql@10.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class PostgresqlAT10 < Formula
url "https://ftp.postgresql.org/pub/source/v10.22/postgresql-10.22.tar.bz2"
sha256 "955977555c69df1a64f44b81d4a1987eb74abbd1870579f5ad9d946133dd8e4d"
license "PostgreSQL"
revision 1

livecheck do
url "https://ftp.postgresql.org/pub/source/"
Expand Down
1 change: 1 addition & 0 deletions Formula/postgresql@11.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class PostgresqlAT11 < Formula
url "https://ftp.postgresql.org/pub/source/v11.17/postgresql-11.17.tar.bz2"
sha256 "6e984963ae0765e61577995103a7e6594db0f0bd01528ac123e0de4a6a4cb4c4"
license "PostgreSQL"
revision 1

livecheck do
url "https://ftp.postgresql.org/pub/source/"
Expand Down
1 change: 1 addition & 0 deletions Formula/postgresql@12.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class PostgresqlAT12 < Formula
url "https://ftp.postgresql.org/pub/source/v12.12/postgresql-12.12.tar.bz2"
sha256 "34b3f1c69408e22068c0c71b1827691f1c89153b0ad576c1a44f8920a858039c"
license "PostgreSQL"
revision 1

livecheck do
url "https://ftp.postgresql.org/pub/source/"
Expand Down
1 change: 1 addition & 0 deletions Formula/postgresql@13.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class PostgresqlAT13 < Formula
url "https://ftp.postgresql.org/pub/source/v13.8/postgresql-13.8.tar.bz2"
sha256 "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded"
license "PostgreSQL"
revision 1

livecheck do
url "https://ftp.postgresql.org/pub/source/"
Expand Down
2 changes: 1 addition & 1 deletion Formula/postgresql@14.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class PostgresqlAT14 < Formula
url "https://ftp.postgresql.org/pub/source/v14.5/postgresql-14.5.tar.bz2"
sha256 "d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30"
license "PostgreSQL"
revision 1
revision 2

livecheck do
url "https://ftp.postgresql.org/pub/source/"
Expand Down
1 change: 1 addition & 0 deletions Formula/rxvt-unicode.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class RxvtUnicode < Formula
url "http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.30.tar.bz2"
sha256 "fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d"
license "GPL-3.0-only"
revision 1

livecheck do
url "http://dist.schmorp.de/rxvt-unicode/"
Expand Down
2 changes: 1 addition & 1 deletion Formula/uwsgi.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Uwsgi < Formula
url "https://files.pythonhosted.org/packages/24/fd/93851e4a076719199868d4c918cc93a52742e68370188c1c570a6e42a54f/uwsgi-2.0.20.tar.gz"
sha256 "88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9"
license "GPL-2.0-or-later"
revision 1
revision 2
head "https://github.com/unbit/uwsgi.git", branch: "master"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/v.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class V < Formula
homepage "https://github.com/rupa/v"
url "https://github.com/rupa/v/archive/v1.1.tar.gz"
sha256 "6483ef1248dcbc6f360b0cdeb9f9c11879815bd18b0c4f053a18ddd56a69b81f"
revision 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This formula is just a script and a manpage, so the rev bump seems like it was a mistake.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I think confusion was that it failed during test because vim was broken. Had I run a test where vim was revision bumped but v was not, it would have succeeded. We'll be able to skip revision bumping this when we upgrade to Perl 5.36.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, that's why we rev bump linkage failures before touching any test failures.

head "https://github.com/rupa/v.git", branch: "master"

bottle do
Expand Down
1 change: 1 addition & 0 deletions Formula/vim.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Vim < Formula
url "https://github.com/vim/vim/archive/v9.0.0350.tar.gz"
sha256 "36c211d34beb734fa322975daa170868d7172b1a5f9605257d532cebf956f708"
license "Vim"
revision 1
head "https://github.com/vim/vim.git", branch: "master"

# The Vim repository contains thousands of tags and the `Git` strategy isn't
Expand Down
1 change: 1 addition & 0 deletions Formula/weechat.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Weechat < Formula
url "https://weechat.org/files/src/weechat-3.6.tar.xz"
sha256 "9d85d71b3b7d04c03bd35ab6501afa8b5b3c609dce7691709ec740fecc31f2de"
license "GPL-3.0-or-later"
revision 1
head "https://github.com/weechat/weechat.git", branch: "master"

bottle do
Expand Down