Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Benjamin A. Beasley
2b9802c81a Apply a patch for whitespace test regressions 2025-05-09 22:51:04 -04:00
Benjamin A. Beasley
ba0a0c1545 F41/EPEL10: drop spec-file conditionals and allow branches to diverge 2025-05-08 22:31:35 -04:00
2 changed files with 99 additions and 15 deletions

91
15.patch Normal file

File diff suppressed because one or more lines are too long

View file

@ -2,7 +2,7 @@
# sense. Older versions of this package installed it as unifdefall.sh; for
# compatibility on stable branches that had such older versions, we still
# provide that path via a symlink.
%bcond all_sh %[ %{defined fc42} || %{defined fc41} || %{defined el10} ]
%bcond all_sh 1
Name: unifdef
Version: 2.12
@ -38,6 +38,13 @@ Source: https://dotat.at/prog/unifdef/unifdef-%{version}.tar.xz
# https://github.com/fanf2/unifdef/pull/14
Patch: %{forgeurl}/pull/14.patch
# Fix fgets(..., size=1)
# https://github.com/fanf2/unifdef/pull/15
#
# Further discussion in https://github.com/fanf2/unifdef/pull/19 and
# https://gcc.gnu.org/PR120205.
Patch: %{forgeurl}/pull/15.patch
# Don't use C23 constexpr keyword
# https://github.com/fanf2/unifdef/pull/19
# Fixes compatibility with GCC 15, which defaults to C23
@ -58,22 +65,8 @@ additional text that they delimit, while otherwise leaving the file alone.
# simplify the License, since unifdef.1 is still BSD-3-Clause.
rm -rv FreeBSD/
%if %{undefined fc41} && %{undefined el10} && %{undefined el9} && %{undefined el8}
# Test regressions with GCC 15 / C23 default.
# Reported upstream by email 2025-05-08.
# Described in:
# https://github.com/fanf2/unifdef/pull/19#issuecomment-2863148452
for test in whitespace-1 whitespace-2
do
mv "tests/${test}.sh" "tests/${test}.sh.disabled"
done
%endif
%build
# Implicit in Fedora and EPEL10+; still needed in EPEL8/9.
%set_build_flags
%make_build