1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00

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.
This commit is contained in:
Frantisek Sumsal 2021-03-06 23:17:01 +01:00
parent 8615b1f292
commit faf00fd7e1

View File

@ -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