Skip to content

Commit 3a86bc1

Browse files
committed
switch to bookworm since bullseye support ends in August; omit -fhardened again
git-svn-id: svn://tug.org/texlive/trunk/Build/source@78933 c570f23f-e606-0410-a88d-b1316a301751
1 parent e0e3208 commit 3a86bc1

3 files changed

Lines changed: 19 additions & 11 deletions

File tree

‎.github/ChangeLog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
2026-05-07 Karl Berry <karl@freefriends.org>
22

3+
* workflows/main.yml (debian): update from bullseye(11) to
4+
bookworm (12), since bullseye support ends August 2026.
5+
* scripts/build-tl.sh (CFLAGS): omit -fhardened for now;
6+
requires gcc15. Warns on FreeBSD, where it is recognized but
7+
unsupported.
8+
39
* scripts/build-tl.sh (CFLAGS): add -fhardened. Try doing so
410
unconditionally, though it only has effect on GNU/Linux targets.
511
tlsecurity 29 Apr 2026 03:20:12 et al.

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,16 @@ export TL_MAKE_FLAGS
144144
export CXXFLAGS="$CXXFLAGS -std=c++17"
145145

146146
# Make binaries harder to exploit. This option is only supported on
147-
# GNU/Linux, but harmless on other targets.
148-
export CFLAGS="$CFLAGS -fhardened"
149-
150-
# It's up to us to enable optimization, since we are overriding what
151-
# Autoconf does. Due to the above two assignments, we always set CFLAGS
152-
# and CXXFLAGS, so can just add to them now.
153-
CFLAGS="$CFLAGS -O2"
154-
CXXFLAGS="$CXXFLAGS -O2"
147+
# GNU/Linux, and only as of GCC 15; although it's only a warning if not
148+
# supported, it's too annoying to see the warning on every compilation.
149+
#if echo "$arch" | grep linux >/dev/null; then
150+
# export CFLAGS="$CFLAGS -fhardened"
151+
#fi
152+
153+
# It's up to us to enable optimization if we are overriding the
154+
# compilation flags.
155+
test -z "$CFLAGS" || CFLAGS="$CFLAGS -O2"
156+
test -z "$CXXFLAGS" || CXXFLAGS="$CXXFLAGS -O2"
155157

156158
echo "$0: variables set:"
157159
echo " BUILDARGS=$BUILDARGS"

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- ${{ startsWith(github.ref, 'refs/tags/') }}
5454
include:
5555
- tl_name: i386-linux
56-
image: i386/debian:bullseye
56+
image: i386/debian:bookworm
5757
platform: 386
5858
ci_build: true
5959
use_qemu: false
@@ -71,14 +71,14 @@ jobs:
7171
use_qemu: false
7272
buildsys: alpine
7373
- tl_name: aarch64-linux
74-
image: arm64v8/debian:bullseye
74+
image: arm64v8/debian:bookworm
7575
platform: aarch64
7676
ci_build: true
7777
use_qemu: false
7878
buildsys: debian
7979
runner: ubuntu-24.04-arm
8080
- tl_name: armhf-linux
81-
image: arm32v7/debian:bullseye
81+
image: arm32v7/debian:bookworm
8282
platform: arm/v7
8383
ci_build: true
8484
use_qemu: false

0 commit comments

Comments
 (0)