Change 33483 by [EMAIL PROTECTED] on 2008/03/11 21:22:23
Integrate:
[ 33481]
Subject: Re: Perl @ http://www.ccl4.org/~nick/P/perl-33444.tar.bz2
From: Reini Urban <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Sat, 08 Mar 2008 20:55:36 +0100
* CYG04 At least on cygwin strip the last number
from the dll. This is in the cygwin.com build since years.
[except the -mms-bitfields in CFLAGS, as Jan states that it would break
binary compatibilty on 5.10.1 too]
Affected files ...
... //depot/maint-5.10/perl/cygwin/Makefile.SHs#2 integrate
... //depot/maint-5.10/perl/installperl#3 integrate
... //depot/maint-5.10/perl/lib/ExtUtils/t/Embed.t#2 integrate
Differences ...
==== //depot/maint-5.10/perl/cygwin/Makefile.SHs#2 (text) ====
Index: perl/cygwin/Makefile.SHs
--- perl/cygwin/Makefile.SHs#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/cygwin/Makefile.SHs 2008-03-11 14:22:23.000000000 -0700
@@ -34,7 +34,13 @@
libperl=`echo $libperl|sed -e s,\\\..*,,`
linklibperl=-l`echo $libperl|sed -e s,^lib,,`
vers=`echo $version|tr '.' '_'`
-dllname=`echo $libperl|sed -e s,^lib,cyg,`$vers
+dllname=`echo $libperl|sed -e s,^lib,cyg,``echo $vers|sed -e s,_[0-9]$,,`
+# append "d" suffix to -DDEBUGGING build: cygperl5_10d.dll
+case $config_args in
+ *DEBUGGING*)
+ dllname="${dllname}"d
+ ;;
+esac
$spitshell >>Makefile <<!GROK!THIS!
LIBPERL = $libperl
==== //depot/maint-5.10/perl/installperl#3 (xtext) ====
Index: perl/installperl
--- perl/installperl#2~33158~ 2008-01-31 13:47:25.000000000 -0800
+++ perl/installperl 2008-03-11 14:22:23.000000000 -0700
@@ -283,7 +283,7 @@
if ($Is_Cygwin) {
$perldll = $libperl;
- my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/;
+ my $v_e_r_s = substr($ver,0,-2); $v_e_r_s =~ tr/./_/;
$perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/;
$perldll =~ s/^lib/cyg/;
} else {
@@ -368,6 +368,7 @@
# Install library files.
my ($do_installarchlib, $do_installprivlib) = (0, 0);
+my $vershort = $Is_Cygwin ? substr($ver,0,-2) : $ver;
mkpath($installprivlib, $verbose, 0777);
mkpath($installarchlib, $verbose, 0777);
@@ -377,7 +378,7 @@
if (chdir "lib") {
$do_installarchlib = ! samepath($installarchlib, '.');
$do_installprivlib = ! samepath($installprivlib, '.');
- $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$ver/);
+ $do_installprivlib = 0 if $versiononly && !($installprivlib =~
m/\Q$vershort/);
if ($do_installarchlib || $do_installprivlib) {
find(\&installlib, '.');
@@ -570,7 +571,7 @@
# ($installprivlib/pods for cygwin).
my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
-if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
+if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) {
mkpath("${installprivlib}/$pod", $verbose, 0777);
# If Perl 5.003's perldiag.pod is there, rename it.
==== //depot/maint-5.10/perl/lib/ExtUtils/t/Embed.t#2 (text) ====
Index: perl/lib/ExtUtils/t/Embed.t
--- perl/lib/ExtUtils/t/Embed.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/lib/ExtUtils/t/Embed.t 2008-03-11 14:22:23.000000000 -0700
@@ -106,7 +106,7 @@
}
}
elsif ($^O eq 'cygwin') { # Cygwin needs the shared libperl copied
- my $v_e_r_s = $Config{version};
+ my $v_e_r_s = substr($Config{version},0,-2);
$v_e_r_s =~ tr/./_/;
system("cp ../cygperl$v_e_r_s.dll ./"); # for test 1
}
End of Patch.
