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

Proposal to have ExtUtils::MakeMaker maintain all rpath arguments #440

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proposal to have ExtUtils::MakeMaker maintain all rpath arguments #440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03ca89a
Have ExtUtils::MakeMaker maintain all rpath arguments
Mar 23, 2023
91977a5
Do a Makefile escape of any single '$' in the rpath value ($ -> $$)
Mar 23, 2023
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
15 changes: 9 additions & 6 deletions lib/ExtUtils/Liblist/Kid.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@ sub _unix_os2_ext {
# Handle possible linker path arguments.
if ( $thislib =~ s/^(-[LR]|-Wl,-R|-Wl,-rpath,)// ) { # save path flag type
my ( $ptype ) = $1;
unless ( -d $thislib ) {
warn "$ptype$thislib ignored, directory does not exist\n"
if $verbose;
next;
}
my ( $rtype ) = $ptype;
if ( ( $ptype eq '-R' ) or ( $ptype =~ m!^-Wl,-[Rr]! ) ) {
if ( $Config{'lddlflags'} =~ /-Wl,-[Rr]/ ) {
Expand All @@ -89,8 +84,16 @@ sub _unix_os2_ext {
elsif ( $Config{'lddlflags'} =~ /-R/ ) {
$rtype = '-R';
}
if ($thislib =~ s{(?<!\$)\$(?!\$)}{\\\$\$}g) {
Leont marked this conversation as resolved.
Show resolved Hide resolved
print "Escaping single dollar sign for Makefile\n"
if $verbose;
}
} elsif (!-d $thislib ) {
warn "$ptype$thislib ignored, directory does not exist\n"
if $verbose;
next;
}
unless ( File::Spec->file_name_is_absolute( $thislib ) ) {
if (-d $thislib && !File::Spec->file_name_is_absolute( $thislib ) ) {
warn "Warning: $ptype$thislib changed to $ptype$pwd/$thislib\n";
$thislib = $self->catdir( $pwd, $thislib );
}
Expand Down