From b9611f9c4b1e8041780bb3484eccd730e96cc3c8 Mon Sep 17 00:00:00 2001 From: Siep Kroonenberg Date: Mon, 6 Mar 2023 13:45:46 +0000 Subject: Updated diffs and READMEs git-svn-id: svn://tug.org/texlive/trunk@66389 c570f23f-e606-0410-a88d-b1316a301751 --- Master/source/tlgui/tltcl/tltcl.README | 7 +- Master/source/tlperl/Config.pm.diff | 29 ++++---- Master/source/tlperl/Config_heavy.pl.diff | 115 +++++++++++++++--------------- Master/source/tlperl/GNUmakefile.diff | 15 ++-- Master/source/tlperl/tlperl.README | 7 +- 5 files changed, 89 insertions(+), 84 deletions(-) (limited to 'Master/source') diff --git a/Master/source/tlgui/tltcl/tltcl.README b/Master/source/tlgui/tltcl/tltcl.README index f6adad85fcc..d9c6f33c035 100644 --- a/Master/source/tlgui/tltcl/tltcl.README +++ b/Master/source/tlgui/tltcl/tltcl.README @@ -1,3 +1,8 @@ +Notes on building Tcl/Tk for TeX Live 2023 + +For 2023, the same recipe applies as for 2022 below, except that +configure is invoked with a --host=x86_64-w64-mingw32 parameter: + Notes on building Tcl/Tk for TeX Live 2022 The 2022 edition contains a subset of a basic Tcl/Tk installation. @@ -43,4 +48,4 @@ For testing, see tlperl.README. Siep Kroonenberg -March 2022 +March 2022/2023 diff --git a/Master/source/tlperl/Config.pm.diff b/Master/source/tlperl/Config.pm.diff index 6d57760a334..8f26c3db1d7 100644 --- a/Master/source/tlperl/Config.pm.diff +++ b/Master/source/tlperl/Config.pm.diff @@ -1,34 +1,35 @@ ---- Config.pm.orig 2022-03-01 21:42:18.929802600 +0100 -+++ Config.pm 2022-03-04 18:10:13.257294472 +0100 -@@ -82,9 +82,14 @@ +--- Config.pm.orig 2022-07-11 12:22:33.494504400 +0200 ++++ Config.pm 2022-07-11 13:35:06.559388900 +0200 +@@ -81,10 +81,15 @@ + goto \&launcher unless $Config::AUTOLOAD =~ /launcher$/; die "&Config::AUTOLOAD failed on $Config::AUTOLOAD"; } - ++ +my $rootdir = __FILE__; +$rootdir =~ s![\\/][^\\/]*[\\/][^\\/]*$!!; +$rootdir =~ s!/!\\!g; -+my $mingdir = "E:\\mingw"; -+ ++my $mingdir = "E:\\mingw64"; + # tie returns the object, so the value returned to require will be true. tie %Config, 'Config', { -- archlibexp => 'e:\\tlperl\\lib', +- archlibexp => 'E:\\tlperl\\lib', + archlibexp => "$rootdir\\lib", - archname => 'MSWin32-x86-multi-thread', + archname => 'MSWin32-x64-multi-thread', cc => 'gcc', d_readlink => 'define', @@ -96,14 +101,14 @@ inc_version_list => '', intsize => '4', ldlibpthname => '', -- 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", +- libpth => 'E:\\mingw64\\lib E:\\mingw64\\x86_64-w64-mingw32\\lib E:\\mingw64\\lib\\gcc\\x86_64-w64-mingw32\\8.3.0', ++ libpth => "$mingdir\\lib $mingdir\\x86_64-w64-mingw32\\lib $mingdir\\lib\\gcc\\x86_64-w64-mingw32\\8.3.0", osname => 'MSWin32', osvers => '10.0.19042.508', path_sep => ';', -- privlibexp => 'e:\\tlperl\\lib', -- scriptdir => 'e:\\tlperl\\bin', -- sitearchexp => 'e:\\tlperl\\site\\lib', -- sitelibexp => 'e:\\tlperl\\site\\lib', +- privlibexp => 'E:\\tlperl\\lib', +- scriptdir => 'E:\\tlperl\\bin', +- sitearchexp => 'E:\\tlperl\\site\\lib', +- sitelibexp => 'E:\\tlperl\\site\\lib', + privlibexp => "$rootdir\\lib", + scriptdir => "$rootdir\\bin", + sitearchexp => "$rootdir\\site\\lib", diff --git a/Master/source/tlperl/Config_heavy.pl.diff b/Master/source/tlperl/Config_heavy.pl.diff index e7c96aacafe..eea73a2df71 100644 --- a/Master/source/tlperl/Config_heavy.pl.diff +++ b/Master/source/tlperl/Config_heavy.pl.diff @@ -1,5 +1,5 @@ ---- Config_heavy.pl.orig 2022-03-01 21:42:18.914167400 +0100 -+++ Config_heavy.pl 2022-03-05 15:53:46.407656882 +0100 +--- Config_heavy.pl.orig 2022-07-11 12:22:33.494504400 +0200 ++++ Config_heavy.pl 2022-07-11 14:17:47.006110500 +0200 @@ -66,7 +66,7 @@ util.h); } @@ -9,15 +9,16 @@ ### Target system: WIN32 our $summary = <<'!END!'; -@@ -156,15 +156,20 @@ +@@ -155,16 +155,21 @@ + }ge; $summary_expanded; } - ++ +my $rootdir = __FILE__; +$rootdir =~ s![\\/][^\\/]*[\\/][^\\/]*$!!; +$rootdir =~ s!/!\\!g; -+my $mingdir = "E:\\mingw"; -+ ++my $mingdir = "E:\\mingw64"; + local *_ = \my $a; -$_ = <<'!END!'; +$_ = <<"!END!"; @@ -49,19 +50,19 @@ api_version='34' api_versionstring='5.34.0' ar='ar' --archlib='e:\tlperl\lib' --archlibexp='e:\tlperl\lib' +-archlib='E:\tlperl\lib' +-archlibexp='E:\tlperl\lib' +archlib='$rootdir\\lib' +archlibexp='$rootdir\\lib' - archname='MSWin32-x86-multi-thread' + archname='MSWin32-x64-multi-thread' archname64='' archobjs='' @@ -200,8 +205,8 @@ awk='awk' baserev='5' bash='' --bin='e:\tlperl\bin' --binexp='e:\tlperl\bin' +-bin='E:\tlperl\bin' +-binexp='E:\tlperl\bin' +bin='$rootdir\\bin' +binexp='$rootdir\\bin' bison='' @@ -73,33 +74,33 @@ cf_by='siepo' -cf_email='siepo@DESKTOP-7HC7FHH' +cf_email='tex-live\@tug.org' - cf_time='Tue Mar 1 12:42:18 2022' + cf_time='Mon Jul 11 03:22:33 2022' charbits='8' chgrp='' @@ -985,26 +990,26 @@ ignore_versioned_solibs='' inc_version_list='' inc_version_list_init='0' --incpath='E:\MinGW\include' +-incpath='E:\mingw64\include' +incpath='$mingdir\\include' inews='' initialinstalllocation='' --installarchlib='e:\tlperl\lib' --installbin='e:\tlperl\bin' +-installarchlib='E:\tlperl\lib' +-installbin='E:\tlperl\bin' +installarchlib='$rootdir\\lib' +installbin='$rootdir\\bin' installhtml1dir='' installhtml3dir='' --installhtmldir='e:\tlperl\html' --installhtmlhelpdir='e:\tlperl\htmlhelp' --installman1dir='e:\tlperl\man\man1' --installman3dir='e:\tlperl\man\man3' --installprefix='e:\tlperl' --installprefixexp='e:\tlperl' --installprivlib='e:\tlperl\lib' --installscript='e:\tlperl\bin' --installsitearch='e:\tlperl\site\lib' --installsitebin='e:\tlperl\bin' +-installhtmldir='E:\tlperl\html' +-installhtmlhelpdir='E:\tlperl\htmlhelp' +-installman1dir='E:\tlperl\man\man1' +-installman3dir='E:\tlperl\man\man3' +-installprefix='E:\tlperl' +-installprefixexp='E:\tlperl' +-installprivlib='E:\tlperl\lib' +-installscript='E:\tlperl\bin' +-installsitearch='E:\tlperl\site\lib' +-installsitebin='E:\tlperl\bin' +installhtmldir='$rootdir\\html' +installhtmlhelpdir='$rootdir\\htmlhelp' +installman1dir='$rootdir\\man\\man1' @@ -112,7 +113,7 @@ +installsitebin='$rootdir\\bin' installsitehtml1dir='' installsitehtml3dir='' --installsitelib='e:\tlperl\site\lib' +-installsitelib='E:\tlperl\site\lib' +installsitelib='$rootdir\\site\\lib' installsiteman1dir='' installsiteman3dir='' @@ -121,18 +122,18 @@ 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:\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"' +-lddlflags='-mdll -s -L"E:\tlperl\lib\CORE" -L"E:\mingw64\lib" -L"E:\mingw64\x86_64-w64-mingw32\lib" -L"E:\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0"' +-ldflags='-s -L"E:\tlperl\lib\CORE" -L"E:\mingw64\lib" -L"E:\mingw64\x86_64-w64-mingw32\lib" -L"E:\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0"' ++lddlflags='-mdll -s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib" -L"$mingdir\\x86_64-w64-mingw32\lib" -L"$mingdir\\lib\\gcc\\x86_64-w64-mingw32\\8.3.0"' ++ldflags='-s -L"rootdir\\lib\\CORE" -L"mingdir\\lib" -L"$mingdir\\x86_64-w64-mingw32\\lib" -L"$mingdir\\lib\\gcc\\x86_64-w64-mingw32\\8.3.0"' ldflags_uselargefiles='' ldlibpthname='' less='less' lib_ext='.a' libc='' 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' +-libpth='E:\mingw64\lib E:\mingw64\x86_64-w64-mingw32\lib E:\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0' ++libpth='$mingdir\\lib $mingdir\\x86_64-w64-mingw32\lib $mingdir\\lib\\gcc\\x86_64-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='' @@ -140,13 +141,13 @@ mallocobj='malloc.o' mallocsrc='malloc.c' malloctype='void *' --man1dir='e:\tlperl\man\man1' --man1direxp='e:\tlperl\man\man1' +-man1dir='E:\tlperl\man\man1' +-man1direxp='E:\tlperl\man\man1' +man1dir='$rootdir\\man\\man1' +man1direxp='$rootdir\\man\\man1' man1ext='1' --man3dir='e:\tlperl\man\man3' --man3direxp='e:\tlperl\man\man3' +-man3dir='E:\tlperl\man\man3' +-man3direxp='E:\tlperl\man\man3' +man3dir='$rootdir\\man\\man3' +man3direxp='$rootdir\\man\\man3' man3ext='3' @@ -156,7 +157,7 @@ perl_static_inline='static __inline__' perladmin='' perllibs=' -lmoldname -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr -lwinmm -lversion -lodbc32 -lodbccp32 -lcomctl32' --perlpath='e:\tlperl\bin\perl.exe' +-perlpath='E:\tlperl\bin\perl.exe' +perlpath='$rootdir\\bin\\perl.exe' pg='' phostname='hostname' @@ -164,23 +165,23 @@ plibpth='' pmake='' pr='' --prefix='e:\tlperl' --prefixexp='e:\tlperl' --privlib='e:\tlperl\lib' --privlibexp='e:\tlperl\lib' +-prefix='E:\tlperl' +-prefixexp='E:\tlperl' +-privlib='E:\tlperl\lib' +-privlibexp='E:\tlperl\lib' +prefix='$rootdir' +prefixexp='$rootdir' +privlib='$rootdir\\lib' +privlibexp='$rootdir\\lib' procselfexe='' prototype='define' - ptrsize='4' + ptrsize='8' @@ -1177,8 +1182,8 @@ - sPRIx64='"lx"' + sPRIx64='"I64x"' sSCNfldbl='"Lf"' sched_yield='' --scriptdir='e:\tlperl\bin' --scriptdirexp='e:\tlperl\bin' +-scriptdir='E:\tlperl\bin' +-scriptdirexp='E:\tlperl\bin' +scriptdir='$rootdir\\bin' +scriptdirexp='$rootdir\\bin' sed='sed' @@ -190,10 +191,10 @@ sig_num_init='0, 1, 2, 21, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 20, 0' sig_size='27' signal_t='void' --sitearch='e:\tlperl\site\lib' --sitearchexp='e:\tlperl\site\lib' --sitebin='e:\tlperl\site\bin' --sitebinexp='e:\tlperl\site\bin' +-sitearch='E:\tlperl\site\lib' +-sitearchexp='E:\tlperl\site\lib' +-sitebin='E:\tlperl\site\bin' +-sitebinexp='E:\tlperl\site\bin' +sitearch='$rootdir\\site\\lib' +sitearchexp='$rootdir\\site\\lib' +sitebin='$rootdir\\site\\bin' @@ -202,22 +203,22 @@ sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' --sitelib='e:\tlperl\site\lib' +-sitelib='E:\tlperl\site\lib' +sitelib='$rootdir\\site\\lib' sitelib_stem='' --sitelibexp='e:\tlperl\site\lib' +-sitelibexp='E:\tlperl\site\lib' +sitelibexp='$rootdir\\site\\lib' siteman1dir='' siteman1direxp='' siteman3dir='' siteman3direxp='' --siteprefix='e:\tlperl\site' --siteprefixexp='e:\tlperl\site' +-siteprefix='E:\tlperl\site' +-siteprefixexp='E:\tlperl\site' +siteprefix='$rootdir\\site' +siteprefixexp='$rootdir\\site' sitescript='' sitescriptexp='' - sizesize='4' + sizesize='8' @@ -1269,7 +1274,7 @@ to=':' touch='touch' @@ -233,9 +234,9 @@ -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"' + ccflags_nolargefiles=' -DWIN32 -DWIN64 -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:\mingw64\lib" -L"E:\mingw64\x86_64-w64-mingw32\lib" -L"E:\mingw64\lib\gcc\x86_64-w64-mingw32\8.3.0"' ++ldflags_nolargefiles='-s -L"$rootdir\\lib\\CORE" -L"$mingdir\\lib" -L"mingdir\\x86_64-w64-mingw32\\lib" -L"$mingdir\\lib\\gcc\\x86_64-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 diff --git a/Master/source/tlperl/GNUmakefile.diff b/Master/source/tlperl/GNUmakefile.diff index 73187432b1d..159146324f2 100644 --- a/Master/source/tlperl/GNUmakefile.diff +++ b/Master/source/tlperl/GNUmakefile.diff @@ -1,23 +1,16 @@ --- GNUmakefile.orig 2021-05-15 10:16:04.000000000 +0200 -+++ GNUmakefile 2022-03-01 21:39:56.023727600 +0100 -@@ -46,14 +46,14 @@ ++++ GNUmakefile 2022-07-11 12:19:23.510682300 +0200 +@@ -46,8 +46,8 @@ # Set these to wherever you want "gmake install" to put your # newly built perl. # -INST_DRV := c: -INST_TOP := $(INST_DRV)\perl -+INST_DRV := e: ++INST_DRV := E: +INST_TOP := $(INST_DRV)\tlperl # # Uncomment if you want to build a 32-bit Perl using a 32-bit compiler - # on a 64-bit version of Windows. - # --#WIN64 := undef -+WIN64 := undef - - # - # Comment this out if you DON'T want your perl installation to be versioned. @@ -156,7 +156,7 @@ # HKEY_CURRENT_USER\Software\Perl and HKEY_LOCAL_MACHINE\Software\Perl in # the Registry. @@ -41,7 +34,7 @@ # lib directories for your compiler. # -#CCHOME := C:\MinGW -+CCHOME := E:\MinGW ++CCHOME := E:\mingw64 # # Additional compiler flags can be specified here. diff --git a/Master/source/tlperl/tlperl.README b/Master/source/tlperl/tlperl.README index 2bae4074b20..e8e92776758 100644 --- a/Master/source/tlperl/tlperl.README +++ b/Master/source/tlperl/tlperl.README @@ -1,4 +1,9 @@ -NOTES ON BUILDING TLPERL 2021 +NOTES ON BUILDING TLPERL 2023 + +I reused the sources for 2022, and the same recipes apply. The diffs +for Config.pm, Config_heavy and GNUmakefile have been updated. + +NOTES ON BUILDING TLPERL 2022 BUILD PLATFORM -- cgit v1.2.3