From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-cpp/range-v3/files/0.11.0-gcc10.patch | 133 ++++++++++++++++++++++++++ dev-cpp/range-v3/files/0.11.0-no-werror.patch | 39 ++++++++ 2 files changed, 172 insertions(+) create mode 100644 dev-cpp/range-v3/files/0.11.0-gcc10.patch create mode 100644 dev-cpp/range-v3/files/0.11.0-no-werror.patch (limited to 'dev-cpp/range-v3/files') diff --git a/dev-cpp/range-v3/files/0.11.0-gcc10.patch b/dev-cpp/range-v3/files/0.11.0-gcc10.patch new file mode 100644 index 000000000000..caebf0a63162 --- /dev/null +++ b/dev-cpp/range-v3/files/0.11.0-gcc10.patch @@ -0,0 +1,133 @@ +From a91f0e1be27a31c446452a753001d4518ef83a6b Mon Sep 17 00:00:00 2001 +From: Eric Niebler +Date: Mon, 17 Aug 2020 17:48:09 -0700 +Subject: [PATCH] work around premature instantiation problem on gcc; fixes + #1545 + +--- + include/range/v3/view/chunk.hpp | 6 +++--- + include/range/v3/view/split.hpp | 26 +++++++++++++------------- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/include/range/v3/view/chunk.hpp b/include/range/v3/view/chunk.hpp +index 0c03cf1eb..b8df13303 100644 +--- a/include/range/v3/view/chunk.hpp ++++ b/include/range/v3/view/chunk.hpp +@@ -313,8 +313,8 @@ namespace ranges + + public: + inner_view() = default; +- constexpr explicit inner_view(chunk_view_ & view) noexcept +- : rng_{&view} ++ constexpr explicit inner_view(chunk_view_ * view) noexcept ++ : rng_{view} + {} + CPP_auto_member + constexpr auto CPP_fun(size)()( +@@ -338,7 +338,7 @@ namespace ranges + constexpr inner_view read() const + { + RANGES_EXPECT(!done()); +- return inner_view{*rng_}; ++ return inner_view{rng_}; + } + constexpr bool done() const + { +diff --git a/include/range/v3/view/split.hpp b/include/range/v3/view/split.hpp +index facf1b37f..496220e4a 100644 +--- a/include/range/v3/view/split.hpp ++++ b/include/range/v3/view/split.hpp +@@ -389,19 +389,19 @@ namespace ranges + split_outer_iterator() = default; + + CPP_member +- constexpr explicit CPP_ctor(split_outer_iterator)(Parent & parent)( ++ constexpr explicit CPP_ctor(split_outer_iterator)(Parent * parent)( + /// \pre + requires (!forward_range)) +- : parent_(&parent) ++ : parent_(parent) + {} + + CPP_member +- constexpr CPP_ctor(split_outer_iterator)(Parent & parent, ++ constexpr CPP_ctor(split_outer_iterator)(Parent * parent, + iterator_t current)( + /// \pre + requires forward_range) + : Current{std::move(current)} +- , parent_(&parent) ++ , parent_(parent) + {} + + template(bool Other)( +@@ -519,7 +519,7 @@ namespace ranges + ranges::equal_to> && + (forward_range || detail::tiny_range) + #endif +- struct RANGES_EMPTY_BASES split_view ++ struct RANGES_EMPTY_BASES split_view + : view_interface, is_finite::value ? finite : unknown> + , private detail::split_view_base> + { +@@ -537,17 +537,17 @@ namespace ranges + #if RANGES_CXX_IF_CONSTEXPR < RANGES_CXX_IF_CONSTEXPR_17 + outer_iterator()> begin_(std::true_type) + { +- return outer_iterator()>{*this, ranges::begin(base_)}; ++ return outer_iterator()>{this, ranges::begin(base_)}; + } + outer_iterator begin_(std::false_type) + { + this->curr_ = ranges::begin(base_); +- return outer_iterator{*this}; ++ return outer_iterator{this}; + } + + outer_iterator()> end_(std::true_type) const + { +- return outer_iterator{*this, ranges::end(base_)}; ++ return outer_iterator{this, ranges::end(base_)}; + } + default_sentinel_t end_(std::false_type) const + { +@@ -580,11 +580,11 @@ namespace ranges + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range) +- return outer_iterator()>{*this, ranges::begin(base_)}; ++ return outer_iterator()>{this, ranges::begin(base_)}; + else + { + this->curr_ = ranges::begin(base_); +- return outer_iterator{*this}; ++ return outer_iterator{this}; + } + #else + return begin_(meta::bool_>{}); +@@ -596,7 +596,7 @@ namespace ranges + /// \pre + requires forward_range && forward_range) + { +- return {*this, ranges::begin(base_)}; ++ return {this, ranges::begin(base_)}; + } + CPP_member + constexpr auto end() // +@@ -604,14 +604,14 @@ namespace ranges + /// \pre + requires forward_range && common_range) + { +- return outer_iterator()>{*this, ranges::end(base_)}; ++ return outer_iterator()>{this, ranges::end(base_)}; + } + constexpr auto end() const + { + #if RANGES_CXX_IF_CONSTEXPR >= RANGES_CXX_IF_CONSTEXPR_17 + if constexpr(forward_range && forward_range && + common_range) +- return outer_iterator{*this, ranges::end(base_)}; ++ return outer_iterator{this, ranges::end(base_)}; + else + return default_sentinel; + #else diff --git a/dev-cpp/range-v3/files/0.11.0-no-werror.patch b/dev-cpp/range-v3/files/0.11.0-no-werror.patch new file mode 100644 index 000000000000..1894fcc93b6c --- /dev/null +++ b/dev-cpp/range-v3/files/0.11.0-no-werror.patch @@ -0,0 +1,39 @@ +From 66e847d4e14be3a369b7e26a03a172b20e62c003 Mon Sep 17 00:00:00 2001 +From: eksi +Date: Wed, 4 Nov 2020 20:37:01 +0300 +Subject: [PATCH] Add an option to disable -Werror. Fixes #1528 + +--- + cmake/ranges_flags.cmake | 4 +++- + cmake/ranges_options.cmake | 3 +++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/ranges_flags.cmake b/cmake/ranges_flags.cmake +index 76d893043..9b09ddcb8 100644 +--- a/cmake/ranges_flags.cmake ++++ b/cmake/ranges_flags.cmake +@@ -88,7 +88,9 @@ else() + # Enable "normal" warnings and make them errors: + ranges_append_flag(RANGES_HAS_WALL -Wall) + ranges_append_flag(RANGES_HAS_WEXTRA -Wextra) +- ranges_append_flag(RANGES_HAS_WERROR -Werror) ++ if (RANGES_ENABLE_WERROR) ++ ranges_append_flag(RANGES_HAS_WERROR -Werror) ++ endif() + endif() + + if (RANGES_ENV_LINUX AND RANGES_CXX_COMPILER_CLANG) +diff --git a/cmake/ranges_options.cmake b/cmake/ranges_options.cmake +index 4ec39c7f0..8455af306 100644 +--- a/cmake/ranges_options.cmake ++++ b/cmake/ranges_options.cmake +@@ -16,6 +16,9 @@ option(RANGES_MODULES "Enables use of Clang modules (experimental)." OFF) + option(RANGES_NATIVE "Enables -march/-mtune=native." ON) + option(RANGES_VERBOSE_BUILD "Enables debug output from CMake." OFF) + option(RANGES_LLVM_POLLY "Enables LLVM Polly." OFF) ++option(RANGES_ENABLE_WERROR ++ "Enables -Werror. Only effective if compiler is not clang-cl or MSVC. ON by default" ++ ON) + option(RANGES_PREFER_REAL_CONCEPTS + "Use real concepts instead of emulation if the compiler supports it" + ON) -- cgit v1.2.3