From faf00fd7e1db0b71ff4fd9863b63108183f49bed Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 6 Mar 2021 23:17:01 +0100
Subject: ci: revert back to --werror instead of -Dc_args=-Werror

-Dc_args=/-Dcpp_args= don't play well with the RPM hardening macros
using $CFLAGS/$CPPFLAGS, since they're mutually exclusive.
---
 .packit.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to '.packit.yml')

diff --git a/.packit.yml b/.packit.yml
index ebc553443b..75f9d3abc9 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -22,18 +22,13 @@ actions:
     # - Patch0000-0499: backported patches from upstream
     # - Patch0500-9999: downstream-only patches
     - "sed -ri '/^Patch0[0-4]?[0-9]{0,2}\\:.+\\.patch/d' .packit_rpm/systemd.spec"
-    # Build the RPMs with -Werror to catch possible compiler warnings. Since
-    # --werror in meson doesn't seem to work with -Db_lto=true [0], let's use
-    # -Dc_args= and -Dcpp_args= instead.
-    #
-    # Exceptions:
-    #   - use -Wno-deprecated-declarations to get around mallinfo() use in
-    #     basic/selinux-util.c
-    #   - don't use -Werror on x86 architectures, otherwise all function checks
-    #     will fail (with error: cast from pointer to integer of different size)
+    # Build the RPM with --werror. Even though --werror doesn't work in all
+    # cases (see [0]), we can't use -Dc_args=/-Dcpp_args= here because of the
+    # RPM hardening macros, that use $CFLAGS/$CPPFLAGS (see [1]).
     #
     # [0] https://github.com/mesonbuild/meson/issues/7360
-    - 'sed -i "/^CONFIGURE_OPTS=(/a%ifnarch i386 i686\n-Dc_args=\"-Werror -Wno-deprecated-declarations\" -Dcpp_args=\"-Werror -Wno-deprecated-declarations\"\n%endif" .packit_rpm/systemd.spec'
+    # [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110
+    - 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec'
 
 jobs:
 - job: copr_build
-- 
cgit v1.2.1