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

Jump to bottom

autoconf: fix Linux build #25610

Merged
merged 3 commits into from
Oct 23, 2024
Merged

autoconf: fix Linux build #25610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a95aa88
autoconf: use system Perl only on Darwin, fix Linux builds
barracuda156 Sep 4, 2024
51586a7
autoconf: use help2man on Linux
barracuda156 Sep 4, 2024
30d891d
libtool: depend on help2man on non-Darwin OS
barracuda156 Sep 4, 2024
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
14 changes: 11 additions & 3 deletions devel/autoconf/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,17 @@ post-patch {
touch ${worksrcpath}/man/autoreconf.1
}

# It should be safe to use the system Perl, since the scripts only use
# core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6.
configure.perl /usr/bin/perl
if {${os.platform} eq "darwin"} {
# It should be safe to use the system Perl, since the scripts only use
# core modules. The README prescribes 5.6 or later, and Tiger has 5.8.6.
configure.perl /usr/bin/perl
} else {
depends_build-append \
port:help2man \
port:perl5
# https://trac.macports.org/ticket/70673
configure.perl ${prefix}/bin/perl5
Copy link
Contributor

Choose a reason for hiding this comment

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

help2man depends on perl5.34. perl5.34 provides the perl5.34 executable. The perl5 symlink is provided by the perl5 port. If you want to use the perl5 symlink here you have to depend on the perl5 port.

}

test.run yes
test.env CC=${configure.cc}
Expand Down
2 changes: 1 addition & 1 deletion devel/libtool/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ configure.env M4=${prefix}/bin/gm4
if {${os.platform} eq "darwin"} {
configure.env-append GREP=/usr/bin/grep SED=/usr/bin/sed
} else {
depends_lib-append port:grep port:gsed
depends_lib-append port:grep port:gsed port:help2man
}

# Don't look for broken compilers (#23684, #32321).
Expand Down
Loading