summaryrefslogtreecommitdiff
path: root/dev-libs/pegtl
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
commit129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-libs/pegtl
parent441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
gentoo new year resync : 01.01.2021
Diffstat (limited to 'dev-libs/pegtl')
-rw-r--r--dev-libs/pegtl/Manifest4
-rw-r--r--dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch29
-rw-r--r--dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch43
-rw-r--r--dev-libs/pegtl/pegtl-2.8.3-r1.ebuild (renamed from dev-libs/pegtl/pegtl-2.8.3.ebuild)15
4 files changed, 89 insertions, 2 deletions
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 7b5975871a8f..1fb65a719818 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1,3 +1,5 @@
+AUX pegtl-2.8.3-cmake.patch 1688 BLAKE2B d99c349dc31468cf84c2d2f3a26d514e5ae8c55bf72f444ce6def76cd858fe2ce58f7c4d5d305ab7ef3c150204895fcff8c3f662d78e40941a5344827ad587ff SHA512 076bc724a09edb3c1d1962a686da9e48d469a3fbfec056e1abbe401f80b9b2eee67aee06afdb7fd540c3997ae6f9cb6a33f63f713c5ee88825f75c6c488c581b
+AUX pegtl-2.8.3-gcc-10.patch 1499 BLAKE2B 55d866cd49d3c3ea157981c948127f7b1b29a7e9eef4f4f660aece9a322065faac2e0df8d1ed5f0c48b9ed009f94942b99e49eee13680ba5b2c25ef062a6ba2c SHA512 3a9255811d4c579aeb7552ff9eb6697e9401746ce0df031e2432266e946c6ff0b7e26792c37bf01c3ee3a89d31aaa8b39f4527025701ed0f6e6a49a96a93984f
DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
-EBUILD pegtl-2.8.3.ebuild 459 BLAKE2B 759adfc2254e76720502caaea090d943e176eb7d910e939d58b94c4b6ae489dd02498d5a85501045d40c5e89dab7e11c3c806e47de85ca881fd2a68955c66ad4 SHA512 09f6ea0d459982f3d135b19e4488d6adf8541f0fc39095d358b43ee0e94d0f6c98e3e9d62138404aa0fa27fbd0181d3b6c9734670969a5f92b6a3ba23f9d64f9
+EBUILD pegtl-2.8.3-r1.ebuild 721 BLAKE2B 4c454e690b9cfc3e0821a777b54d4fb70177661da034ff04bb041b9eaa1e2d60ec3b9b096316340375e759c4b8d089d597a228822042d1c20de0f8b7612a6b63 SHA512 156a28795e95171d63f2f8417b1986fae280f7ebfe1424e452e2f9896955b2cf74723e4de521ab1c9e7d318aa7011627af413d4162514bb84c762a132e823bc6
MISC metadata.xml 330 BLAKE2B 4b09139ea492f1fefc4b58c0afde7354d8f9f966932f5b0908c43c6fab7ae9e822ee8fe02905763d8fe69a128bb7159d4a8b3cea7b1ab087a8a30a57ab297f83 SHA512 721c1b987d580024e7c937f54c512c1e55351db3011675080fd8b1a36c42916eb216b30707f270655db76dea8bc9ee4548197270ffc51b570bbbc0fde33503bf
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
new file mode 100644
index 000000000000..140e1f5cfbb8
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200
++++ b/CMakeLists.txt 2020-12-27 00:00:15.886046938 +0100
+@@ -78,4 +78,3 @@
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
+ install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
+-install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
+--- a/src/test/pegtl/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200
++++ b/src/test/pegtl/CMakeLists.txt 2020-12-27 00:07:19.122766830 +0100
+@@ -123,7 +123,7 @@
+ if(MSVC)
+ target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+ else()
+- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+ endif()
+ if(ANDROID)
+ add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
+--- a/src/example/pegtl/CMakeLists.txt 2020-04-22 19:43:00.000000000 +0200
++++ b/src/example/pegtl/CMakeLists.txt 2020-12-27 00:07:32.970832890 +0100
+@@ -48,7 +48,7 @@
+ if(MSVC)
+ target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
+ else()
+- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
+ endif()
+ endforeach(examplesourcefile)
+
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
new file mode 100644
index 000000000000..ef418e44254e
--- /dev/null
+++ b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
@@ -0,0 +1,43 @@
+From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
+From: Daniel Frey <d.frey@gmx.de>
+Date: Mon, 11 May 2020 22:19:31 +0200
+Subject: [PATCH] Repair warning from GCC 10
+
+* Backported patch thx to Fedora.
+
+---
+ include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+index 7ec4639e..ee0a3782 100644
+--- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
++++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
+@@ -45,6 +45,27 @@ namespace tao
+ }
+ };
+
++ template< unsigned Max, char C >
++ struct rep_one_min_max< 0, Max, C >
++ {
++ using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
++
++ template< typename Input >
++ static bool match( Input& in )
++ {
++ const auto size = in.size( Max + 1 );
++ std::size_t i = 0;
++ while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
++ ++i;
++ }
++ if( i <= Max ) {
++ bump_help< result_on_found::success, Input, char, C >( in, i );
++ return true;
++ }
++ return false;
++ }
++ };
++
+ template< unsigned Min, unsigned Max, char C >
+ inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
+
diff --git a/dev-libs/pegtl/pegtl-2.8.3.ebuild b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
index a2ead2df29fe..ba9a54cdf773 100644
--- a/dev-libs/pegtl/pegtl-2.8.3.ebuild
+++ b/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
@@ -11,9 +11,22 @@ SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
S="${WORKDIR}/PEGTL-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-gcc-10.patch" # bug 733678
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DPEGTL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/${PN}"
+ -DPEGTL_INSTALL_DOC_DIR="share/doc/${PF}"
+ )
+ cmake_src_configure
+}