| 1 |
commit: 8dc16924bbb14d50d910cebd45987735177fb152 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 15 01:37:28 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 15 01:37:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc16924 |
| 7 |
|
| 8 |
dev-libs/pegtl: drop -Werror |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/787854 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch | 56 ++++++++++++++++++++++++ |
| 14 |
dev-libs/pegtl/pegtl-3.2.0.ebuild | 5 ++- |
| 15 |
2 files changed, 60 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..32bc4b5103e |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/pegtl/files/pegtl-3.2.0-no-werror.patch |
| 22 |
@@ -0,0 +1,56 @@ |
| 23 |
+https://bugs.gentoo.org/787854 |
| 24 |
+ |
| 25 |
+From b807854fc6573d59350551578375075fc61a21e1 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Sam James <sam@g.o> |
| 27 |
+Date: Tue, 15 Jun 2021 01:31:40 +0000 |
| 28 |
+Subject: [PATCH] Drop -Werror |
| 29 |
+ |
| 30 |
+Signed-off-by: Sam James <sam@g.o> |
| 31 |
+--- |
| 32 |
+ Makefile | 2 +- |
| 33 |
+ src/example/pegtl/CMakeLists.txt | 2 +- |
| 34 |
+ src/test/pegtl/CMakeLists.txt | 2 +- |
| 35 |
+ 3 files changed, 3 insertions(+), 3 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/Makefile b/Makefile |
| 38 |
+index 3ecca07..2b8fa20 100644 |
| 39 |
+--- a/Makefile |
| 40 |
++++ b/Makefile |
| 41 |
+@@ -30,7 +30,7 @@ endif |
| 42 |
+ # changed if desired. |
| 43 |
+ |
| 44 |
+ CPPFLAGS ?= -pedantic |
| 45 |
+-CXXFLAGS ?= -Wall -Wextra -Wshadow -Werror -O3 $(MINGW_CXXFLAGS) |
| 46 |
++CXXFLAGS ?= -Wall -Wextra -Wshadow $(MINGW_CXXFLAGS) |
| 47 |
+ |
| 48 |
+ HEADERS := $(shell find include -name '*.hpp') |
| 49 |
+ SOURCES := $(shell find src -name '*.cpp') |
| 50 |
+diff --git a/src/example/pegtl/CMakeLists.txt b/src/example/pegtl/CMakeLists.txt |
| 51 |
+index d416731..4d1a417 100644 |
| 52 |
+--- a/src/example/pegtl/CMakeLists.txt |
| 53 |
++++ b/src/example/pegtl/CMakeLists.txt |
| 54 |
+@@ -60,7 +60,7 @@ foreach(examplesourcefile ${example_sources}) |
| 55 |
+ if(MSVC) |
| 56 |
+ target_compile_options(${exename} PRIVATE /W4 /WX /utf-8) |
| 57 |
+ else() |
| 58 |
+- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror) |
| 59 |
++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow) |
| 60 |
+ endif() |
| 61 |
+ endforeach() |
| 62 |
+ |
| 63 |
+diff --git a/src/test/pegtl/CMakeLists.txt b/src/test/pegtl/CMakeLists.txt |
| 64 |
+index 577e310..84a8ab8 100644 |
| 65 |
+--- a/src/test/pegtl/CMakeLists.txt |
| 66 |
++++ b/src/test/pegtl/CMakeLists.txt |
| 67 |
+@@ -146,7 +146,7 @@ foreach(testsourcefile ${test_sources}) |
| 68 |
+ if(MSVC) |
| 69 |
+ target_compile_options(${exename} PRIVATE /W4 /WX /utf-8) |
| 70 |
+ else() |
| 71 |
+- target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror) |
| 72 |
++ target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow) |
| 73 |
+ endif() |
| 74 |
+ if(ANDROID) |
| 75 |
+ add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} "-DANDROID_NDK=${ANDROID_NDK}" "-DTEST_RESOURCES_DIR=${CMAKE_SOURCE_DIR}" "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" "-DUNITTEST=${exename}" -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake) |
| 76 |
+-- |
| 77 |
+2.32.0 |
| 78 |
+ |
| 79 |
|
| 80 |
diff --git a/dev-libs/pegtl/pegtl-3.2.0.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild |
| 81 |
index 88365e453f4..638a33f9abd 100644 |
| 82 |
--- a/dev-libs/pegtl/pegtl-3.2.0.ebuild |
| 83 |
+++ b/dev-libs/pegtl/pegtl-3.2.0.ebuild |
| 84 |
@@ -8,6 +8,7 @@ inherit cmake |
| 85 |
DESCRIPTION="Header-only library for creating parsers according to Parsing Expression Grammar" |
| 86 |
HOMEPAGE="https://github.com/taocpp/PEGTL" |
| 87 |
SRC_URI="https://github.com/taocpp/PEGTL/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 88 |
+S="${WORKDIR}/${P^^}" |
| 89 |
|
| 90 |
LICENSE="MIT" |
| 91 |
SLOT="0" |
| 92 |
@@ -15,7 +16,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 93 |
IUSE="test" |
| 94 |
RESTRICT="!test? ( test )" |
| 95 |
|
| 96 |
-S="${WORKDIR}/${P^^}" |
| 97 |
+PATCHES=( |
| 98 |
+ "${FILESDIR}"/${PN}-3.2.0-no-werror.patch |
| 99 |
+) |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
local mycmakeargs=( |
Archives