Merge branch 'master' into build/work000 r73231

.github/workflows/build-ubuntu.yml

@@ -154,7 +154,15 @@ jobs:
       - name: make libs
         shell: bash
         run: |
-          mkdir -p ./source/Work/libs/{gmp,mpfr,mpfi}
+          mkdir -p ./source/Work/libs/{pixman,cairo,gmp,mpfr,mpfi}
+          cd ${{ github.workspace }}/source/Work/libs/pixman
+          ../../../libs/pixman/configure
+          make
+          make check
+          cd ${{ github.workspace }}/source/Work/libs/cairo
+          ../../../libs/cairo/configure
+          make
+          make check
           cd ${{ github.workspace }}/source/Work/libs/gmp
           ../../../libs/gmp/configure
           make
@@ -202,8 +210,8 @@ jobs:
             --without-system-zlib \
             --without-system-libpng \
             --without-system-freetype2 \
-            --with-system-pixman \
-            --with-system-cairo \
+            --without-system-pixman \
+            --without-system-cairo \
             --without-system-gmp \
             --without-system-mpfr \
             --without-system-poppler \

source/.github/scripts/build-tl.sh

@@ -34,8 +34,8 @@ then
        ;;
      almalinux)
        yum update -y
-       yum install -y gcc-toolset-9 fontconfig-devel libX11-devel libXmu-devel libXaw-devel
-       . /opt/rh/gcc-toolset-9/enable
+       yum install -y gcc-toolset-11 fontconfig-devel libX11-devel libXmu-devel libXaw-devel
+       . /opt/rh/gcc-toolset-11/enable
        ;;
      centos)
        yum update -y
@@ -96,11 +96,13 @@ BUILDARGS=""
 
 # special cases
 case "$arch" in
-  armhf-linux)
+  armhf-linux) # debian:buster
     TL_MAKE_FLAGS="-j 1"
+    export CXXFLAGS='-std=c++17'
     ;;
-  aarch64-linux)
+  aarch64-linux) # debian:buster
     BUILDARGS="--enable-arm-neon=on"
+    export CXXFLAGS='-std=c++17'
     ;;
   *-solaris)
     export PATH=/opt/csw/bin:$PATH
@@ -119,7 +121,10 @@ case "$arch" in
     export CC=gcc 
     export CXX=g++
     export CFLAGS=-D_NETBSD_SOURCE
-    export CXXFLAGS='-D_NETBSD_SOURCE -std=c++11'
+    export CXXFLAGS='-D_NETBSD_SOURCE -std=c++17'
+    ;;
+  x86_64-linux|i386-linux|x86_64-linuxmusl)
+    export CXXFLAGS='-std=c++17'
     ;;
 esac
 export TL_MAKE_FLAGS

source/.github/workflows/main.yml

@@ -53,19 +53,19 @@ jobs:
           - ${{ startsWith(github.ref, 'refs/tags/') }}
         include:
           - tl_name: i386-linux
-            image: i386/ubuntu:xenial
+            image: i386/debian:buster
             platform: 386
             ci_build: true
             use_qemu: false
-            buildsys: ubuntu
+            buildsys: debian
           - tl_name: x86_64-linux
             image: almalinux:8
             platform: amd64
             ci_build: true
             use_qemu: false
             buildsys: almalinux
           - tl_name: x86_64-linuxmusl
-            image: alpine:3.5
+            image: alpine:3.12
             platform: amd64
             ci_build: true
             use_qemu: false

source/README

@@ -48,25 +48,20 @@ x86_64-cygwin: gcc-10.2.0, cygwin-3.1.7
     LDFLAGS='-Wl,--no-insert-timestamp -Wl,--stack,0x800000'" \
   ./Build
 
-i386-freebsd amd64-freebsd:
-  Built on contextgarden, see below.
-  FreeBSD 11.4
-  upstream: https://www.freshports.org/devel/tex-web2c/
+i386-freebsd amd64-freebsd: see info at end.
 
-i386-linux: see travis below.
+i386-linux: see info at end.
 
 i386-netbsd, amd64-netbsd:
   NetBSD/amd64 9.3
   gcc version 7.5.0 (nb4 20200810)
     TL_MAKE=gmake CC=gcc CXX=g++ \
     CFLAGS=-D_NETBSD_SOURCE \
-    CXXFLAGS='-D_NETBSD_SOURCE -std=c++11' \
+    CXXFLAGS='-D_NETBSD_SOURCE -std=c++17' \
     LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \
   ./Build --enable-xindy CLISP=/usr/local/bin/clisp
 
-i386-solaris, x86_64-solaris:
-  Built on contextgarden, see below.
-  Solaris 10, gcc 5.5.  See doc/README.solaris.
+i386-solaris, x86_64-solaris: see info at end.
 
 universal-darwin: See Master/source/mactexdoc.tar.xz.
 
@@ -81,13 +76,8 @@ x86_64-darwinlegacy:
   http://build.contextgarden.net/waterfall?tag=c/texlive
   (These links have info on all platforms built by Mojca.)
 
-i386-linux,
 x86_64-linux,
-x86_64-linuxmusl:
-  CentOS 7 Docker image with musl libc 1.1.5, plus gcc10:
-    yum -y install centos-release-scl-rh
-    yum -y install devtoolset-9-gcc-c++
-    yum install -y fontconfig-devel libX11-devel libXmu-devel libXaw-devel
-  Binaries are taken from the CI testing via github;
-  see the source/.github/* files for details on how to build,
-  and tlpkg/bin/tl-update-bindir for updating binaries (in general).
+x86_64-linuxmusl,
+and others noted above:
+  built at https://github.com/TeX-Live/texlive-source/releases.
+  see ./github/scripts/build-tl.sh.

source/build-aux/compile

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2024-12-03.03; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 # Written by Tom Tromey <[email protected]>.
@@ -343,7 +343,7 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"

source/build-aux/depcomp

@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2024-12-03.03; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 
@@ -784,7 +784,7 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"

source/build-aux/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2024-06-19.01; # UTC
+scriptversion=2024-12-03.03; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -533,7 +533,7 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"