Revert "Fix C99 compatibility issue"

This reverts commit e9e9dec33a: the C99
compatibility issue has been fixed upstream.
This commit is contained in:
Stefano Brivio 2023-02-17 14:07:31 +00:00
parent e9e9dec33a
commit 040ec3f667
2 changed files with 2 additions and 24 deletions

View File

@ -1,18 +0,0 @@
Avoid an implicit int, to prevent build failures with future compilers.
Submitted upstream: <https://bugs.passt.top/show_bug.cgi?id=42>
diff --git a/Makefile b/Makefile
index 1dc2df5884d3b597..cd62900e7406e155 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ ifeq ($(shell :|$(CC) -fstack-protector-strong -S -xc - -o - >/dev/null 2>&1; ec
FLAGS += -fstack-protector-strong
endif
-C := \#define _GNU_SOURCE\n\#include <fcntl.h>\nx = FALLOC_FL_COLLAPSE_RANGE;
+C := \#define _GNU_SOURCE\n\#include <fcntl.h>\nint x = FALLOC_FL_COLLAPSE_RANGE;
ifeq ($(shell printf "$(C)" | $(CC) -S -xc - -o - >/dev/null 2>&1; echo $$?),0)
EXTRA_SYSCALLS += fallocate
endif

View File

@ -11,13 +11,12 @@
Name: passt
Version: 0^20221116.gace074c
Release: 3%{?dist}
Release: 2%{?dist}
Summary: User-mode networking daemons for virtual machines and namespaces
License: AGPLv3+ and BSD
Group: System Environment/Daemons
URL: https://passt.top/
Source: https://passt.top/passt/snapshot/passt-%{git_hash}.tar.xz
Patch0: passt-c99.patch
BuildRequires: gcc, make, checkpolicy, selinux-policy-devel
@ -46,7 +45,7 @@ Requires(preun): policycoreutils
This package adds SELinux enforcement to passt(1) and pasta(1).
%prep
%autosetup -p1 -n passt-%{git_hash}
%setup -q -n passt-%{git_hash}
%build
%set_build_flags
@ -97,9 +96,6 @@ semodule -r pasta 2>/dev/null || :
%{_datadir}/selinux/packages/%{name}/pasta.pp
%changelog
* Fri Feb 03 2023 Florian Weimer <fweimer@redhat.com> - 0^20221116.gace074c-3
- Fix C99 compatibility issue
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0^20221116.gace074c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild