[packages/boost] - added fallthrough patch (use safer define for BOOST_FALLTHROUGH, fixes conflict with zfs/spl); rel

qboosh qboosh at pld-linux.org
Thu Jun 9 19:14:21 CEST 2022


commit 937de54d974bdb5dd3cb6ffa970d6d7446e4cba1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jun 9 19:15:08 2022 +0200

    - added fallthrough patch (use safer define for BOOST_FALLTHROUGH, fixes conflict with zfs/spl); release 3

 boost-fallthrough.patch | 13 +++++++++++++
 boost.spec              |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/boost.spec b/boost.spec
index d624bf6..aeb25f7 100644
--- a/boost.spec
+++ b/boost.spec
@@ -14,13 +14,14 @@ Summary:	The Boost C++ Libraries
 Summary(pl.UTF-8):	Biblioteki C++ "Boost"
 Name:		boost
 Version:	1.79.0
-Release:	2
+Release:	3
 License:	Boost Software License and others
 Group:		Libraries
 Source0:	https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/%{name}_%{fver}.tar.bz2
 # Source0-md5:	ce966eccb3c296a27abfef9356fd1dc4
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-clean-gcc-flags.patch
+Patch2:		%{name}-fallthrough.patch
 # FC Patches:
 Patch201:	%{name}-python-abi_letters.patch
 # https://svn.boost.org/trac/boost/ticket/5637
@@ -497,6 +498,7 @@ Dokumentacja dla biblioteki Boost C++.
 %setup -q -n %{name}_%{fver}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %patch201 -p1
 %patch203 -p0
diff --git a/boost-fallthrough.patch b/boost-fallthrough.patch
new file mode 100644
index 0000000..87eaa55
--- /dev/null
+++ b/boost-fallthrough.patch
@@ -0,0 +1,13 @@
+`fallthrough` may be redefined (as in OpenZFS's spl), so use `__fallthrough`
+
+--- boost_1_79_0/boost/config/compiler/gcc.hpp.orig	2022-06-04 19:46:23.536373946 +0200
++++ boost_1_79_0/boost/config/compiler/gcc.hpp	2022-06-08 17:18:20.938885867 +0200
+@@ -320,7 +320,7 @@
+ #endif
+ 
+ #if __GNUC__ >= 7
+-#  define BOOST_FALLTHROUGH __attribute__((fallthrough))
++#  define BOOST_FALLTHROUGH __attribute__((__fallthrough__))
+ #endif
+ 
+ #if (__GNUC__ < 11) && defined(__MINGW32__) && !defined(__MINGW64__)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/boost.git/commitdiff/937de54d974bdb5dd3cb6ffa970d6d7446e4cba1



More information about the pld-cvs-commit mailing list