Skip to content

Commit 626aa15

Browse files
committed
Generate for 5.36.0
1 parent f48a4ac commit 626aa15

File tree

24 files changed

+504
-688
lines changed

24 files changed

+504
-688
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,23 @@
1-
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
2-
index a6da855..fa301ad 100644
3-
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
4-
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
5-
@@ -171,6 +171,10 @@ sub _unix_os2_ext {
6-
&& -f ( $fullname = "$thispth/lib$thislib.$Config_dlext" ) )
7-
{
8-
}
9-
+ elsif ( $^O eq 'darwin' && require DynaLoader && defined &DynaLoader::dl_load_file
10-
+ && DynaLoader::dl_load_file( $fullname = "$thispth/lib$thislib.$so", 0 ) )
11-
+ {
12-
+ }
13-
elsif ( -f ( $fullname = "$thispth/$thislib$Config_libext" ) ) {
14-
}
15-
elsif ( -f ( $fullname = "$thispth/lib$thislib.dll$Config_libext" ) ) {
16-
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
17-
index 41e6f94..0494881 100644
18-
--- a/ext/DynaLoader/DynaLoader_pm.PL
19-
+++ b/ext/DynaLoader/DynaLoader_pm.PL
20-
@@ -497,12 +497,18 @@ sub dl_findfile {
21-
foreach $name (@names) {
22-
my($file) = "$dir$dirsep$name";
23-
print STDERR " checking in $dir for $name\n" if $dl_debug;
24-
- $file = ($do_expand) ? dl_expandspec($file) : (-f $file && $file);
25-
- #$file = _check_file($file);
26-
- if ($file) {
27-
+ if ($do_expand && ($file = dl_expandspec($file))) {
28-
+ push @found, $file;
29-
+ next arg; # no need to look any further
30-
+ }
31-
+ elsif (-f $file) {
32-
push(@found, $file);
33-
next arg; # no need to look any further
34-
}
35-
+ elsif (dl_load_file($file, 0)) {
36-
+ push @found, $file;
37-
+ next arg; # no need to look any further
38-
+ }
39-
}
40-
}
41-
}
42-
diff --git a/hints/darwin.sh b/hints/darwin.sh
43-
index 0a91bc0..fdfbdd4 100644
44-
--- a/hints/darwin.sh
45-
+++ b/hints/darwin.sh
46-
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
47-
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
48-
# capturing its value and adding it to the flags.
49-
case "$MACOSX_DEPLOYMENT_TARGET" in
50-
- 10.*)
51-
+ [1-9][0-9].*)
52-
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
53-
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
54-
;;
55-
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
1+
diff --git a/hints/linux.sh b/hints/linux.sh
2+
index a985a8e..c749f0f 100644
3+
--- a/hints/linux.sh
4+
+++ b/hints/linux.sh
5+
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
566

57-
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
58-
***
59-
-*** Please either set it to 10.something, or to empty.
60-
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
61-
62-
EOM
63-
exit 1
64-
@@ -327,7 +327,7 @@ EOM
65-
# "ProductVersion: 10.11" "10.11"
66-
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
67-
case "$prodvers" in
68-
- 10.*)
69-
+ [1-9][0-9].*)
70-
add_macosx_version_min ccflags $prodvers
71-
add_macosx_version_min ldflags $prodvers
72-
;;
73-
@@ -342,11 +342,10 @@ EOM
74-
exit 1
75-
esac
76-
77-
- # The X in 10.X
78-
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
79-
+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
80-
81-
- # macOS (10.12) deprecated syscall().
82-
- if [ "$prodvers_minor" -ge 12 ]; then
83-
+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
84-
+ if [ "$darwin_major" -ge 16 ]; then
85-
d_syscall='undef'
86-
# If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
87-
case "$MACOSX_DEPLOYMENT_TARGET" in
7+
# Check if we're about to use Intel's ICC compiler
8+
case "`${cc:-cc} -V 2>&1`" in
9+
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
10+
+*"Intel(R) C"*" Compiler"*)
11+
# record the version, formats:
12+
# icc (ICC) 10.1 20080801
13+
# icpc (ICC) 10.1 20080801
14+
@@ -165,6 +165,9 @@ esac
15+
# plibpth to bypass this check.
16+
if [ -x /usr/bin/gcc ] ; then
17+
gcc=/usr/bin/gcc
18+
+# clang also provides -print-search-dirs
19+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
20+
+ gcc=${cc:-cc}
21+
else
22+
gcc=gcc
23+
fi
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,23 @@
1-
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
2-
index a6da855..fa301ad 100644
3-
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
4-
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
5-
@@ -171,6 +171,10 @@ sub _unix_os2_ext {
6-
&& -f ( $fullname = "$thispth/lib$thislib.$Config_dlext" ) )
7-
{
8-
}
9-
+ elsif ( $^O eq 'darwin' && require DynaLoader && defined &DynaLoader::dl_load_file
10-
+ && DynaLoader::dl_load_file( $fullname = "$thispth/lib$thislib.$so", 0 ) )
11-
+ {
12-
+ }
13-
elsif ( -f ( $fullname = "$thispth/$thislib$Config_libext" ) ) {
14-
}
15-
elsif ( -f ( $fullname = "$thispth/lib$thislib.dll$Config_libext" ) ) {
16-
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
17-
index 41e6f94..0494881 100644
18-
--- a/ext/DynaLoader/DynaLoader_pm.PL
19-
+++ b/ext/DynaLoader/DynaLoader_pm.PL
20-
@@ -497,12 +497,18 @@ sub dl_findfile {
21-
foreach $name (@names) {
22-
my($file) = "$dir$dirsep$name";
23-
print STDERR " checking in $dir for $name\n" if $dl_debug;
24-
- $file = ($do_expand) ? dl_expandspec($file) : (-f $file && $file);
25-
- #$file = _check_file($file);
26-
- if ($file) {
27-
+ if ($do_expand && ($file = dl_expandspec($file))) {
28-
+ push @found, $file;
29-
+ next arg; # no need to look any further
30-
+ }
31-
+ elsif (-f $file) {
32-
push(@found, $file);
33-
next arg; # no need to look any further
34-
}
35-
+ elsif (dl_load_file($file, 0)) {
36-
+ push @found, $file;
37-
+ next arg; # no need to look any further
38-
+ }
39-
}
40-
}
41-
}
42-
diff --git a/hints/darwin.sh b/hints/darwin.sh
43-
index 0a91bc0..fdfbdd4 100644
44-
--- a/hints/darwin.sh
45-
+++ b/hints/darwin.sh
46-
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
47-
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
48-
# capturing its value and adding it to the flags.
49-
case "$MACOSX_DEPLOYMENT_TARGET" in
50-
- 10.*)
51-
+ [1-9][0-9].*)
52-
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
53-
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
54-
;;
55-
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
1+
diff --git a/hints/linux.sh b/hints/linux.sh
2+
index a985a8e..c749f0f 100644
3+
--- a/hints/linux.sh
4+
+++ b/hints/linux.sh
5+
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
566

57-
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
58-
***
59-
-*** Please either set it to 10.something, or to empty.
60-
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
61-
62-
EOM
63-
exit 1
64-
@@ -327,7 +327,7 @@ EOM
65-
# "ProductVersion: 10.11" "10.11"
66-
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
67-
case "$prodvers" in
68-
- 10.*)
69-
+ [1-9][0-9].*)
70-
add_macosx_version_min ccflags $prodvers
71-
add_macosx_version_min ldflags $prodvers
72-
;;
73-
@@ -342,11 +342,10 @@ EOM
74-
exit 1
75-
esac
76-
77-
- # The X in 10.X
78-
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
79-
+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
80-
81-
- # macOS (10.12) deprecated syscall().
82-
- if [ "$prodvers_minor" -ge 12 ]; then
83-
+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
84-
+ if [ "$darwin_major" -ge 16 ]; then
85-
d_syscall='undef'
86-
# If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
87-
case "$MACOSX_DEPLOYMENT_TARGET" in
7+
# Check if we're about to use Intel's ICC compiler
8+
case "`${cc:-cc} -V 2>&1`" in
9+
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
10+
+*"Intel(R) C"*" Compiler"*)
11+
# record the version, formats:
12+
# icc (ICC) 10.1 20080801
13+
# icpc (ICC) 10.1 20080801
14+
@@ -165,6 +165,9 @@ esac
15+
# plibpth to bypass this check.
16+
if [ -x /usr/bin/gcc ] ; then
17+
gcc=/usr/bin/gcc
18+
+# clang also provides -print-search-dirs
19+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
20+
+ gcc=${cc:-cc}
21+
else
22+
gcc=gcc
23+
fi
+22-86
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,23 @@
1-
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
2-
index a6da855..fa301ad 100644
3-
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
4-
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
5-
@@ -171,6 +171,10 @@ sub _unix_os2_ext {
6-
&& -f ( $fullname = "$thispth/lib$thislib.$Config_dlext" ) )
7-
{
8-
}
9-
+ elsif ( $^O eq 'darwin' && require DynaLoader && defined &DynaLoader::dl_load_file
10-
+ && DynaLoader::dl_load_file( $fullname = "$thispth/lib$thislib.$so", 0 ) )
11-
+ {
12-
+ }
13-
elsif ( -f ( $fullname = "$thispth/$thislib$Config_libext" ) ) {
14-
}
15-
elsif ( -f ( $fullname = "$thispth/lib$thislib.dll$Config_libext" ) ) {
16-
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
17-
index 41e6f94..0494881 100644
18-
--- a/ext/DynaLoader/DynaLoader_pm.PL
19-
+++ b/ext/DynaLoader/DynaLoader_pm.PL
20-
@@ -497,12 +497,18 @@ sub dl_findfile {
21-
foreach $name (@names) {
22-
my($file) = "$dir$dirsep$name";
23-
print STDERR " checking in $dir for $name\n" if $dl_debug;
24-
- $file = ($do_expand) ? dl_expandspec($file) : (-f $file && $file);
25-
- #$file = _check_file($file);
26-
- if ($file) {
27-
+ if ($do_expand && ($file = dl_expandspec($file))) {
28-
+ push @found, $file;
29-
+ next arg; # no need to look any further
30-
+ }
31-
+ elsif (-f $file) {
32-
push(@found, $file);
33-
next arg; # no need to look any further
34-
}
35-
+ elsif (dl_load_file($file, 0)) {
36-
+ push @found, $file;
37-
+ next arg; # no need to look any further
38-
+ }
39-
}
40-
}
41-
}
42-
diff --git a/hints/darwin.sh b/hints/darwin.sh
43-
index 0a91bc0..fdfbdd4 100644
44-
--- a/hints/darwin.sh
45-
+++ b/hints/darwin.sh
46-
@@ -301,7 +301,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
47-
# We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
48-
# capturing its value and adding it to the flags.
49-
case "$MACOSX_DEPLOYMENT_TARGET" in
50-
- 10.*)
51-
+ [1-9][0-9].*)
52-
add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
53-
add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
54-
;;
55-
@@ -313,7 +313,7 @@ case "$osvers" in # Note: osvers is the kernel version, not the 10.x
1+
diff --git a/hints/linux.sh b/hints/linux.sh
2+
index a985a8e..c749f0f 100644
3+
--- a/hints/linux.sh
4+
+++ b/hints/linux.sh
5+
@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
566

57-
*** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
58-
***
59-
-*** Please either set it to 10.something, or to empty.
60-
+*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
61-
62-
EOM
63-
exit 1
64-
@@ -327,7 +327,7 @@ EOM
65-
# "ProductVersion: 10.11" "10.11"
66-
prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
67-
case "$prodvers" in
68-
- 10.*)
69-
+ [1-9][0-9].*)
70-
add_macosx_version_min ccflags $prodvers
71-
add_macosx_version_min ldflags $prodvers
72-
;;
73-
@@ -342,11 +342,10 @@ EOM
74-
exit 1
75-
esac
76-
77-
- # The X in 10.X
78-
- prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
79-
+ darwin_major=$(echo $osvers|awk -F. '{print $1}')
80-
81-
- # macOS (10.12) deprecated syscall().
82-
- if [ "$prodvers_minor" -ge 12 ]; then
83-
+ # macOS 10.12 (darwin 16.0.0) deprecated syscall().
84-
+ if [ "$darwin_major" -ge 16 ]; then
85-
d_syscall='undef'
86-
# If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
87-
case "$MACOSX_DEPLOYMENT_TARGET" in
7+
# Check if we're about to use Intel's ICC compiler
8+
case "`${cc:-cc} -V 2>&1`" in
9+
-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
10+
+*"Intel(R) C"*" Compiler"*)
11+
# record the version, formats:
12+
# icc (ICC) 10.1 20080801
13+
# icpc (ICC) 10.1 20080801
14+
@@ -165,6 +165,9 @@ esac
15+
# plibpth to bypass this check.
16+
if [ -x /usr/bin/gcc ] ; then
17+
gcc=/usr/bin/gcc
18+
+# clang also provides -print-search-dirs
19+
+elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then
20+
+ gcc=${cc:-cc}
21+
else
22+
gcc=gcc
23+
fi

0 commit comments

Comments
 (0)