Skip to content

Commit

Permalink
Merge 47242f4 into e3dd969
Browse files Browse the repository at this point in the history
  • Loading branch information
jpalao committed Sep 10, 2021
2 parents e3dd969 + 47242f4 commit d55f2bd
Show file tree
Hide file tree
Showing 85 changed files with 8,492 additions and 79 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Expand Up @@ -705,6 +705,7 @@ Joshua ben Jore <jjore@cpan.org>
Joshua Juran <jjuran@gmail.com>
Joshua Pritikin <joshua@paloalto.com>
Joshua Rodd <joshua@rodd.us>
José Palao <jose@palao.com>
José Pedro Oliveira <jpo@di.uminho.pt>
JT McDuffie <jt@kpc.com>
Juan Gallego <Little.Boss@physics.mcgill.ca>
Expand Down
4 changes: 2 additions & 2 deletions Configure
Expand Up @@ -8378,7 +8378,7 @@ EOM
esac
;;
*) case "$osname" in
darwin) dflt='none' ;;
darwin*) dflt='none' ;;
*linux*|svr4*|esix*|solaris|nonstopux) dflt='-fPIC' ;;
*) dflt='-fpic' ;;
esac ;;
Expand Down Expand Up @@ -19992,7 +19992,7 @@ eval $setvar

: Check if is a multiplatform env
case "$osname" in
darwin) multiarch="$define" ;;
darwin*) multiarch="$define" ;;
esac
case "$multiarch" in
''|[nN]*) multiarch="$undef" ;;
Expand Down
27 changes: 27 additions & 0 deletions MANIFEST
Expand Up @@ -4766,6 +4766,32 @@ installperl Perl script to do "make install" dirty work
INTERN.h Included before domestic .h files
intrpvar.h Variables held in each interpreter instance
invlist_inline.h Inline functions for handling inversion lists
ios/build.sh iOS build script
ios/config/appletv/arm64/config.h.diff config.h diffs
ios/config/appletv/arm64/config.sh.cc Configure
ios/config/appletv/arm64/config.sh.diff config.sh diffs
ios/config/appletv/x86_64/config.h.diff config.h diffs
ios/config/appletv/x86_64/config.sh.cc Configure
ios/config/appletv/x86_64/config.sh.diff config.sh diffs
ios/config/config.h.tt config.h template
ios/config/config.sh.tt config.sh template
ios/config/iphone/arm64/config.h.diff config.h diffs
ios/config/iphone/arm64/config.sh.cc Configure
ios/config/iphone/arm64/config.sh.diff config.sh diffs
ios/config/iphone/armv7/config.h.diff config.h diffs
ios/config/iphone/armv7/config.sh.cc Configure
ios/config/iphone/armv7/config.sh.diff config.sh diffs
ios/config/iphone/x86_64/config.h.diff config.h diffs
ios/config/iphone/x86_64/config.sh.cc Configure
ios/config/iphone/x86_64/config.sh.diff config.sh diffs
ios/config/Policy.sh Policy.sh
ios/config/template.pl templating script
ios/config/watch/armv7k/config.h.diff config.h diffs
ios/config/watch/armv7k/config.sh.cc Configure
ios/config/watch/armv7k/config.sh.diff config.sh diffs
ios/config/watch/x86_64/config.h.diff config.h diffs
ios/config/watch/x86_64/config.sh.cc Configure
ios/config/watch/x86_64/config.sh.diff config.sh diffs
iperlsys.h Perl's interface to the system
keywords.c Perl_keyword(), generated by regen/keywords.pl
keywords.h The keyword numbers
Expand Down Expand Up @@ -5491,6 +5517,7 @@ README.freebsd Perl notes for FreeBSD
README.haiku Perl notes for Haiku
README.hpux Perl notes for HP-UX
README.hurd Perl notes for Hurd
README.ios Perl notes for iOS and Apple TV
README.irix Perl notes for Irix
README.jp Perl for Japanese (in EUC-JP)
README.ko Perl for Korean (in EUC-KR)
Expand Down
6 changes: 3 additions & 3 deletions Makefile.SH
Expand Up @@ -398,7 +398,7 @@ $make_set_make
!GROK!THIS!

case "${osname}" in
linux*|darwin)
linux*|darwin*)
$spitshell >>$Makefile <<!GROK!THIS!
# If you're going to use valgrind and it can't be invoked as plain valgrind
# then you'll need to change this, or override it on the make command line.
Expand Down Expand Up @@ -448,7 +448,7 @@ INSTALLPREFIXEXP = $prefix
# $versiononly

case "${osname}:${osvers}" in
darwin:*)
darwin*:*)
$spitshell >>$Makefile <<EOF
# Your locales are broken (osname $osname, osvers $osvers)
Expand Down Expand Up @@ -1064,7 +1064,7 @@ $(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT)
!NO!SUBS!
;;

darwin)
darwin*)
case "$useshrplib$osvers" in
true1[5-9]*|true[2-9]*) $spitshell >>$Makefile <<'!NO!SUBS!'
$(SHRPENV) $(CC) -o perl $(PERL_EXE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) $(perlmain_objs) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
Expand Down
8 changes: 4 additions & 4 deletions Porting/bisect-runner.pl
Expand Up @@ -2402,7 +2402,7 @@ sub patch_hints {
# and changing the default to cater for the current behaviour. (As
# strangely, future versions inherit the current behaviour.)
checkout_file('hints/freebsd.sh');
} elsif ($^O eq 'darwin') {
} elsif ($^O =~ 'darwin') {
if ($major < 8) {
# We can't build on darwin without some of the data in the hints
# file. Probably less surprising to use the earliest version of
Expand Down Expand Up @@ -2682,7 +2682,7 @@ sub patch_SH {
EOPATCH
}

if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/
if ($major == 15 && $^O !~ /^(linux|darwin.*|.*bsd)$/
&& extract_from_file('Makefile.SH', qr/^V.* \?= /)) {
# Remove the GNU-make-ism (which the BSD makes also support, but
# most other makes choke on)
Expand All @@ -2691,7 +2691,7 @@ sub patch_SH {
index 94952bd..13e9001 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -338,8 +338,8 @@ linux*|darwin)
@@ -338,8 +338,8 @@ linux*|darwin*)
$spitshell >>$Makefile <<!GROK!THIS!
# If you're going to use valgrind and it can't be invoked as plain valgrind
# then you'll need to change this, or override it on the make command line.
Expand Down Expand Up @@ -3668,7 +3668,7 @@ sub patch_ext {
apply_commit('550428fe486b1888');
}

if ($major < 8 && $^O eq 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
if ($major < 8 && $^O =~ 'darwin' && !-f 'ext/DynaLoader/dl_dyld.xs') {
checkout_file('ext/DynaLoader/dl_dyld.xs', 'f556e5b971932902');
apply_patch(<<'EOPATCH');
diff -u a/ext/DynaLoader/dl_dyld.xs~ a/ext/DynaLoader/dl_dyld.xs
Expand Down

0 comments on commit d55f2bd

Please sign in to comment.