From f76560bd5fc239dd0a8db403dac58b37f5570cf730f302b884bd4fa1f12aeddd Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Fri, 27 May 2022 14:12:47 +0000 Subject: [PATCH] Accepting request 979489 from home:dfaggioli:old_qemu - It has been observed that building QEMU with _FORTIFY_SOURCE=3 causes problem (see bsc#1199924). Force it to =2 for now, while we investigate the issue. OBS-URL: https://build.opensuse.org/request/show/979489 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=719 --- qemu.changes | 7 +++++++ qemu.spec | 4 +++- qemu.spec.in | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/qemu.changes b/qemu.changes index 1a955ef8..261f31c5 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 27 14:07:50 UTC 2022 - Dario Faggioli + +- It has been observed that building QEMU with _FORTIFY_SOURCE=3 + causes problem (see bsc#1199924). Force it to =2 for now, while + we investigate the issue. + ------------------------------------------------------------------- Mon May 23 12:15:45 UTC 2022 - Dario Faggioli diff --git a/qemu.spec b/qemu.spec index 9083b476..a9ef32b0 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1394,6 +1394,8 @@ cp %{SOURCE13} docs/supported.rst mkdir -p %blddir cd %blddir +# We want to enforce _FORTIFY_SOURCE=2. See bsc#1199924 +EXTRA_CFLAGS="$(echo %{optflags} | sed -E 's/-[A-Z]?_FORTIFY_SOURCE[=]?[0-9]*//g') -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" %srcdir/configure \ --prefix=%_prefix \ --sysconfdir=%_sysconfdir \ @@ -1403,7 +1405,7 @@ cd %blddir --docdir=%_docdir \ --firmwarepath=%_datadir/%name \ --python=%_bindir/python3 \ - --extra-cflags="%{optflags}" \ + --extra-cflags="${EXTRA_CFLAGS}" \ --with-git-submodules=ignore \ --disable-fuzzing \ --disable-multiprocess \ diff --git a/qemu.spec.in b/qemu.spec.in index 6b87be3f..2a3da5d0 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -1128,6 +1128,8 @@ cp %{SOURCE13} docs/supported.rst mkdir -p %blddir cd %blddir +# We want to enforce _FORTIFY_SOURCE=2. See bsc#1199924 +EXTRA_CFLAGS="$(echo %{optflags} | sed -E 's/-[A-Z]?_FORTIFY_SOURCE[=]?[0-9]*//g') -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" %srcdir/configure \ --prefix=%_prefix \ --sysconfdir=%_sysconfdir \ @@ -1137,7 +1139,7 @@ cd %blddir --docdir=%_docdir \ --firmwarepath=%_datadir/%name \ --python=%_bindir/python3 \ - --extra-cflags="%{optflags}" \ + --extra-cflags="${EXTRA_CFLAGS}" \ --with-git-submodules=ignore \ --disable-fuzzing \ --disable-multiprocess \