| 1 |
commit: 54fec07e295015109b12f59526938847b9fcbca2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 16:32:38 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 16:33:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54fec07e |
| 7 |
|
| 8 |
dev-util/cvise: drop -Werror, respect CFLAGS |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/867424 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{cvise-2.5.0.ebuild => cvise-2.5.0-r1.ebuild} | 4 +++ |
| 14 |
.../cvise/files/cvise-2.5.0-no-werror-cflags.patch | 34 ++++++++++++++++++++++ |
| 15 |
2 files changed, 38 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/cvise/cvise-2.5.0.ebuild b/dev-util/cvise/cvise-2.5.0-r1.ebuild |
| 18 |
similarity index 95% |
| 19 |
rename from dev-util/cvise/cvise-2.5.0.ebuild |
| 20 |
rename to dev-util/cvise/cvise-2.5.0-r1.ebuild |
| 21 |
index 05efec46a120..ed819e732b93 100644 |
| 22 |
--- a/dev-util/cvise/cvise-2.5.0.ebuild |
| 23 |
+++ b/dev-util/cvise/cvise-2.5.0-r1.ebuild |
| 24 |
@@ -51,6 +51,10 @@ BDEPEND=" |
| 25 |
) |
| 26 |
" |
| 27 |
|
| 28 |
+PATCHES=( |
| 29 |
+ "${FILESDIR}"/${PN}-2.5.0-no-werror-cflags.patch |
| 30 |
+) |
| 31 |
+ |
| 32 |
llvm_check_deps() { |
| 33 |
has_version "sys-devel/clang:${LLVM_SLOT}" |
| 34 |
} |
| 35 |
|
| 36 |
diff --git a/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch b/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch |
| 37 |
new file mode 100644 |
| 38 |
index 000000000000..b00b524cb2a4 |
| 39 |
--- /dev/null |
| 40 |
+++ b/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch |
| 41 |
@@ -0,0 +1,34 @@ |
| 42 |
+https://bugs.gentoo.org/867424 |
| 43 |
+--- a/CMakeLists.txt |
| 44 |
++++ b/CMakeLists.txt |
| 45 |
+@@ -146,13 +146,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" |
| 46 |
+ OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |
| 47 |
+ # XXX figure out how to get "-std=c++14 -fno-rtti" from LLVM. That's how we |
| 48 |
+ # get those options in the Automake path... |
| 49 |
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wno-error=maybe-uninitialized") |
| 50 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Werror -Wno-error=maybe-uninitialized") |
| 51 |
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-error=maybe-uninitialized") |
| 52 |
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Wno-error=maybe-uninitialized") |
| 53 |
+ if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG) |
| 54 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") |
| 55 |
+ endif() |
| 56 |
+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") |
| 57 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O3") |
| 58 |
++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") |
| 59 |
++ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}") |
| 60 |
+ endif() |
| 61 |
+ |
| 62 |
+ ############################################################################### |
| 63 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 64 |
+index 261a0fb..cbaebc3 100644 |
| 65 |
+--- a/CMakeLists.txt |
| 66 |
++++ b/CMakeLists.txt |
| 67 |
+@@ -151,8 +151,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" |
| 68 |
+ if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG) |
| 69 |
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") |
| 70 |
+ endif() |
| 71 |
+- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") |
| 72 |
+- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}") |
| 73 |
+ endif() |
| 74 |
+ |
| 75 |
+ ############################################################################### |
Archives