summaryrefslogtreecommitdiff
path: root/Master/source/tlperl/Config_heavy.pl.diff
diff options
context:
space:
mode:
Diffstat (limited to 'Master/source/tlperl/Config_heavy.pl.diff')
-rw-r--r--Master/source/tlperl/Config_heavy.pl.diff65
1 files changed, 34 insertions, 31 deletions
diff --git a/Master/source/tlperl/Config_heavy.pl.diff b/Master/source/tlperl/Config_heavy.pl.diff
index c5e6f5a77a7..e7c96aacafe 100644
--- a/Master/source/tlperl/Config_heavy.pl.diff
+++ b/Master/source/tlperl/Config_heavy.pl.diff
@@ -1,22 +1,22 @@
---- Config_heavy.pl.orig 2021-02-23 21:23:58.000000000 +0100
-+++ Config_heavy.pl 2021-02-25 16:09:32.000000000 +0100
+--- Config_heavy.pl.orig 2022-03-01 21:42:18.914167400 +0100
++++ Config_heavy.pl 2022-03-05 15:53:46.407656882 +0100
@@ -66,7 +66,7 @@
util.h);
}
--### Configured by: siepo@DESKTOP-2H3JTBT
+-### Configured by: siepo@DESKTOP-7HC7FHH
+### Configured by: tex-live@tug.org
### Target system: WIN32
our $summary = <<'!END!';
-@@ -157,15 +157,20 @@
+@@ -156,15 +156,20 @@
$summary_expanded;
}
+my $rootdir = __FILE__;
+$rootdir =~ s![\\/][^\\/]*[\\/][^\\/]*$!!;
+$rootdir =~ s!/!\\!g;
-+my $mingdir = "E:\\wprogs\\mingw2021";
++my $mingdir = "E:\\mingw";
+
local *_ = \my $a;
-$_ = <<'!END!';
@@ -31,23 +31,23 @@
Locker=''
-Log='$Log'
+Log='\$Log'
- PATCHLEVEL='32'
+ PATCHLEVEL='34'
PERL_API_REVISION='5'
PERL_API_SUBVERSION='0'
-@@ -175,8 +180,8 @@
+@@ -174,8 +179,8 @@
PERL_REVISION='5'
- PERL_SUBVERSION='1'
- PERL_VERSION='32'
+ PERL_SUBVERSION='0'
+ PERL_VERSION='34'
-RCSfile='$RCSfile'
-Revision='$Revision'
+RCSfile='\$RCSfile'
+Revision='\$Revision'
- SUBVERSION='1'
+ SUBVERSION='0'
Source=''
State=''
-@@ -192,8 +197,8 @@
- api_version='32'
- api_versionstring='5.32.0'
+@@ -191,8 +196,8 @@
+ api_version='34'
+ api_versionstring='5.34.0'
ar='ar'
-archlib='e:\tlperl\lib'
-archlibexp='e:\tlperl\lib'
@@ -56,7 +56,7 @@
archname='MSWin32-x86-multi-thread'
archname64=''
archobjs=''
-@@ -201,8 +206,8 @@
+@@ -200,8 +205,8 @@
awk='awk'
baserev='5'
bash=''
@@ -67,20 +67,20 @@
bison=''
bootstrap_charset='undef'
byacc='byacc'
-@@ -219,7 +224,7 @@
+@@ -218,7 +223,7 @@
ccsymbols=''
ccversion=''
cf_by='siepo'
--cf_email='siepo@DESKTOP-2H3JTBT'
+-cf_email='siepo@DESKTOP-7HC7FHH'
+cf_email='tex-live\@tug.org'
- cf_time='Tue Feb 23 20:23:57 2021'
+ cf_time='Tue Mar 1 12:42:18 2022'
charbits='8'
chgrp=''
@@ -985,26 +990,26 @@
ignore_versioned_solibs=''
inc_version_list=''
inc_version_list_init='0'
--incpath='E:\wprogs\mingw2021\include'
+-incpath='E:\MinGW\include'
+incpath='$mingdir\\include'
inews=''
initialinstalllocation=''
@@ -118,21 +118,21 @@
installsiteman3dir=''
installsitescript=''
@@ -1026,15 +1031,15 @@
- known_extensions='Amiga/ARexx Amiga/Exec Archive/Tar Attribute/Handlers AutoLoader B CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call FindBin GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
+ known_extensions='Amiga/ARexx Amiga/Exec Archive/Tar Attribute/Handlers AutoLoader B CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Compress/Raw/Bzip2 Compress/Raw/Zlib Config/Perl/V Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Devel/SelfStubber Digest Digest/MD5 Digest/SHA Dumpvalue Encode Env Errno Exporter ExtUtils/CBuilder ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/PL2Bat ExtUtils/ParseXS Fcntl File/DosGlob File/Fetch File/Find File/Glob File/Path File/Temp FileCache Filter/Simple Filter/Util/Call FindBin GDBM_File Getopt/Long HTTP/Tiny Hash/Util Hash/Util/FieldHash I18N/Collate I18N/LangTags I18N/Langinfo IO IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 IPC/SysV JSON/PP List/Util Locale/Maketext Locale/Maketext/Simple MIME/Base64 Math/BigInt Math/BigInt/FastCalc Math/BigRat Math/Complex Memoize Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NDBM_File NEXT Net/Ping ODBM_File Opcode POSIX Params/Check Perl/OSType PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Perldoc Pod/Simple Pod/Usage SDBM_File Safe Search/Dict SelfLoader Socket Storable Sys/Hostname Sys/Syslog Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Hash/NamedCapture Tie/Memoize Tie/RefHash Time/HiRes Time/Local Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Filespec VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap XSLoader attributes autodie autouse base bignum constant encoding/warnings experimental if lib libnet mro parent perlfaq podlators re threads threads/shared version'
ksh=''
ld='g++'
--lddlflags='-mdll -s -L"e:\tlperl\lib\CORE" -L"E:\wprogs\mingw2021\lib"'
--ldflags='-s -L"e:\tlperl\lib\CORE" -L"E:\wprogs\mingw2021\lib"'
-+lddlflags='-mdll -s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib"'
-+ldflags='-s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib"'
+-lddlflags='-mdll -s -L"e:\tlperl\lib\CORE" -L"E:\MinGW\lib" -L"E:\MinGW\i686-w64-mingw32\lib" -L"E:\MinGW\lib\gcc\i686-w64-mingw32\8.3.0"'
+-ldflags='-s -L"e:\tlperl\lib\CORE" -L"E:\MinGW\lib" -L"E:\MinGW\i686-w64-mingw32\lib" -L"E:\MinGW\lib\gcc\i686-w64-mingw32\8.3.0"'
++lddlflags='-mdll -s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib" -L"$mingdir\\i686-w64-mingw32\\lib" -L"$mingdir\\lib\\gcc\\i686-w64-mingw32\\8.3.0"'
++ldflags='-s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib" -L"$mingdir\\i686-w64-mingw32\\lib" -L"$mingdir\\lib\\gcc\\i686-w64-mingw32\\8.3.0"'
ldflags_uselargefiles=''
ldlibpthname=''
less='less'
lib_ext='.a'
libc=''
- libperl='libperl532.a'
--libpth='E:\wprogs\mingw2021\lib'
-+libpth='$mingdir\\lib'
+ libperl='libperl534.a'
+-libpth='E:\MinGW\lib E:\MinGW\i686-w64-mingw32\lib E:\MinGW\lib\gcc\i686-w64-mingw32\8.3.0'
++libpth='$mingdir\\lib $mingdir\\i686-w64-mingw32\\lib $mingdir\\lib\\gcc\\i686-w64-mingw32\\8.3.0'
libs=' -lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'
libsdirs=''
libsfiles=''
@@ -227,12 +227,15 @@
troff=''
ttyname_r_proto='0'
u16size='2'
-@@ -1365,7 +1370,7 @@
+@@ -1363,9 +1368,9 @@
- our $Config_SH_expanded = "\n$_" . << 'EOVIRTUAL';
- ccflags_nolargefiles=' -DWIN32 -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -DUSE_PERLIO -fwrapv -fno-strict-aliasing -mms-bitfields'
--ldflags_nolargefiles='-s -L"e:\tlperl\lib\CORE" -L"E:\wprogs\mingw2021\lib"'
-+ldflags_nolargefiles='-s -L\"$rootdir\\lib\\CORE" -L\"$mingdir\\lib\"'
+ my $config_sh_len = length $_;
+
+-our $Config_SH_expanded = "\n$_" . << 'EOVIRTUAL';
++our $Config_SH_expanded = "\n$_" . << "EOVIRTUAL";
+ ccflags_nolargefiles=' -DWIN32 -DPERL_TEXTMODE_SCRIPTS -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DWIN32_NO_REGISTRY -DUSE_PERLIO -D__USE_MINGW_ANSI_STDIO -fwrapv -fno-strict-aliasing -mms-bitfields'
+-ldflags_nolargefiles='-s -L"e:\tlperl\lib\CORE" -L"E:\MinGW\lib" -L"E:\MinGW\i686-w64-mingw32\lib" -L"E:\MinGW\lib\gcc\i686-w64-mingw32\8.3.0"'
++ldflags_nolargefiles='-s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib" -L"$mingdir\\i686-w64-mingw32\\lib" -L"$mingdir\\lib\\gcc\\i686-w64-mingw32\\8.3.0"'
libs_nolargefiles='-lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32'
libswanted_nolargefiles=''
EOVIRTUAL