-
Notifications
You must be signed in to change notification settings - Fork 577
[PATCH 7/11] Configure: support non-perl5 package, and use its installstyle #14586
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
Comments
From @rurbanThis is a bug report for perl from rurban@cpanel.net, Configure: support non-perl5 package, and use its installstyle Perl Info
|
From @rurban0001-Configure-support-non-perl5-package-and-use-its-inst.patchFrom e82caf38d083a00b829f154bd6d83b1dd5a43081 Mon Sep 17 00:00:00 2001
From: Reini Urban <[email protected]>
Date: Fri, 13 Mar 2015 23:34:47 +0100
Subject: [PATCH] Configure: support non-perl5 package, and use its
installstyle
There are inconsistencies in various places for lib/perl5 vs
lib/$package.
The perl -V test also needs to check against $Config{package}
in t/run/switches.t
The package is not guaranteed to be called perl5, it can be overridden.
---
Configure | 11 ++++++-----
t/run/switches.t | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git Configure Configure
index 0a405d3..10902f8 100755
--- Configure
+++ Configure
@@ -7156,9 +7156,9 @@ esac'
case "$installstyle" in
'') case "$prefix" in
*perl*) dflt='lib';;
- *) dflt='lib/perl5' ;;
+ *) dflt="lib/$package" ;;
esac
- ;;
+ ;;
*) dflt="$installstyle" ;;
esac
: Probably not worth prompting for this since we prompt for all
@@ -7222,7 +7222,8 @@ esac
: /opt/perl/lib/perl5... would be redundant.
: The default "style" setting is made in installstyle.U
case "$installstyle" in
-*lib/perl5*) set dflt privlib lib/$package/$version ;;
+*lib/perl5*) set dflt privlib lib/$package/$version ;;
+*lib/$package*) set dflt privlib lib/$package/$version ;;
*) set dflt privlib lib/$version ;;
esac
eval $prefixit
@@ -7470,7 +7471,7 @@ siteprefixexp="$ansexp"
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$sitelib" in
'') case "$installstyle" in
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
+ *lib/$package*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
*) dflt=$siteprefix/lib/site_$prog/$version ;;
esac
;;
@@ -7888,7 +7889,7 @@ case "$vendorprefix" in
'')
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$installstyle" in
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
+ *lib/$package*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
*) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
esac
;;
diff --git t/run/switches.t t/run/switches.t
index 78915e0..bda2ca9 100644
--- t/run/switches.t
+++ t/run/switches.t
@@ -269,7 +269,7 @@ is runperl(stderr => 1, prog => '#!perl -M'),
'-V generates 20+ lines' );
like( runperl( switches => ['-V'] ),
- qr/\ASummary of my perl5 .*configuration:/,
+ qr/\ASummary of my $Config{package} .*configuration:/,
'-V looks okay' );
# lookup a known config var
--
2.1.4
|
@Tux merge or close? |
Migrated from rt.perl.org#124067 (status was 'new')
Searchable as RT124067$
The text was updated successfully, but these errors were encountered: