Fix missing #includes for gcc-11

This commit is contained in:
Jeff Law 2020-11-04 16:01:07 -07:00
parent d24984012a
commit 0e22de8b1b
2 changed files with 44 additions and 1 deletions

38
leatherman-gcc11.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/curl/src/client.cc b/curl/src/client.cc
index 558db6d..d27bb36 100644
--- a/curl/src/client.cc
+++ b/curl/src/client.cc
@@ -1,3 +1,4 @@
+#include <cstddef>
#include <leatherman/curl/client.hpp>
#include <leatherman/curl/request.hpp>
#include <leatherman/curl/response.hpp>
diff --git a/util/src/posix/scoped_descriptor.cc b/util/src/posix/scoped_descriptor.cc
index 6fd1495..8294d0b 100644
--- a/util/src/posix/scoped_descriptor.cc
+++ b/util/src/posix/scoped_descriptor.cc
@@ -1,3 +1,5 @@
+#include <cstddef>
+
#include <leatherman/util/posix/scoped_descriptor.hpp>
using namespace std;
diff --git a/util/src/scope_exit.cc b/util/src/scope_exit.cc
index 764c2fb..441855a 100644
--- a/util/src/scope_exit.cc
+++ b/util/src/scope_exit.cc
@@ -1,3 +1,4 @@
+#include <cstddef>
#include <leatherman/util/scope_exit.hpp>
using namespace std;
diff --git a/util/src/scoped_env.cc b/util/src/scoped_env.cc
index 6c6a041..df26645 100644
--- a/util/src/scoped_env.cc
+++ b/util/src/scoped_env.cc
@@ -1,3 +1,5 @@
+#include <cstddef>
+
#include <leatherman/util/scoped_env.hpp>
#include <leatherman/util/environment.hpp>

View File

@ -1,6 +1,6 @@
Name: leatherman
Version: 1.12.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Collection of C++ and CMake utility libraries
# leatherman is ASL 2.0
@ -14,6 +14,8 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: shared_nowide.patch
# Add missing include for <stdexcept>, no longer indirectly included in GCC 10
Patch1: leatherman-gcc10.patch
# Similar for cstddef and gcc-11
Patch2: %{name}-gcc11.patch
BuildRequires: cmake >= 3.2.2
BuildRequires: make
@ -72,6 +74,9 @@ sed -i -e "s/\s*-Werror\s*//g" cmake/cflags.cmake
%{_libdir}/cmake/%{name}/
%changelog
* Wed Nov 04 2020 Jeff Law <law@redhat.com> - 1.12.0-4
- Fix missing #includes for gcc-11
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild