diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-18 14:27:38 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-18 14:35:07 +0200 |
| commit | 6c077052133c10f0835fe3671742bc6bd8e92e2b (patch) | |
| tree | 3761003e711c454f13f2c9b768756c4d979341c9 /mkosi.images | |
| parent | mkosi: Disable bash debugging in Arch build script (diff) | |
| download | systemd-6c077052133c10f0835fe3671742bc6bd8e92e2b.tar.xz systemd-6c077052133c10f0835fe3671742bc6bd8e92e2b.zip | |
mkosi: undefine FORTIFY_SOURCE instead of setting it zero
Newer gcc complains if FORTIFY_SOURCE=0 is set so just undefine it
instead.
Diffstat (limited to 'mkosi.images')
3 files changed, 4 insertions, 4 deletions
diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot index be7594609d..5abeea5493 100755 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -25,7 +25,7 @@ mount --mkdir --rbind "$PWD/pkg/$ID" "pkg/$ID/src/" # on the makepkg command line so we append to /etc/makepkg.conf instead. The rootfs is overlaid with a # writable tmpfs during the build script so these changes don't end up in the image itself. tee --append /etc/makepkg.conf >/dev/null <<EOF -CFLAGS="$CFLAGS -O0 -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=0" +CFLAGS="$CFLAGS -O0 -Wp,-U_FORTIFY_SOURCE" OPTIONS=( docs !libtool diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot index 46a509b330..f745a2c002 100755 --- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot @@ -31,8 +31,8 @@ DIST="$(rpm --eval %dist)" ARCH="$(rpm --eval %_arch)" SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH" -# TODO: Drop -D_FORTIFY_SOURCE when we switch to CentOS Stream 10. -EXTRA_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=0" +# TODO: Drop -U_FORTIFY_SOURCE when we switch to CentOS Stream 10. +EXTRA_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE" if ((WITH_DEBUG)); then EXTRA_CFLAGS="$EXTRA_CFLAGS -ffile-prefix-map=../src=$SRCDEST" fi diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot index 6261be1990..be27099791 100755 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot @@ -37,7 +37,7 @@ ARCH="$(rpm --eval %_arch)" SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH" # TODO: Enable this when the opensuse spec stops unconditionally setting FORTIFY_SOURCE=2. -# EXTRA_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE,-D_FORTIFY_SOURCE=0" +# EXTRA_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE" EXTRA_CFLAGS="" if ((WITH_DEBUG)); then EXTRA_CFLAGS="$EXTRA_CFLAGS -ffile-prefix-map=../src=$SRCDEST" |