| 1 |
commit: b35c40c2fd6e98f28de0641d30b7849a5a46c08b |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Mon Nov 8 17:17:14 2021 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Mon Nov 8 17:19:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b35c40c2 |
| 7 |
|
| 8 |
app-accessibility/rhvoice: keep Hardening.cmake |
| 9 |
|
| 10 |
Turns out it has options to not add weird flags. |
| 11 |
|
| 12 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 13 |
|
| 14 |
app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 11 +++++------ |
| 15 |
1 file changed, 5 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
| 18 |
index f593a64fa..e23f725d7 100644 |
| 19 |
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
| 20 |
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
|
| 23 |
EAPI=8 |
| 24 |
|
| 25 |
-CMAKE_REMOVE_MODULES_LIST=( Hardening VersionFromGit ) |
| 26 |
+CMAKE_REMOVE_MODULES_LIST=( VersionFromGit ) |
| 27 |
inherit cmake |
| 28 |
|
| 29 |
DESCRIPTION="TTS engine with extended languages support (including Russian)" |
| 30 |
@@ -75,15 +75,11 @@ src_prepare() { |
| 31 |
-i src/third-party/mage/CMakeLists.txt || die |
| 32 |
|
| 33 |
sed -e "/include(VersionFromGit)/d" \ |
| 34 |
- -e "/include(Hardening)/d" \ |
| 35 |
-e "/find_package(Sanitizers)/d" \ |
| 36 |
-e "/getVersionFromGit/d" \ |
| 37 |
- -e "/harden/d" \ |
| 38 |
-i CMakeLists.txt || die |
| 39 |
sed -e "/add_sanitizers/d" \ |
| 40 |
- -e "/harden/d" \ |
| 41 |
- -i src/*/CMakeLists.txt \ |
| 42 |
- -i src/third-party/*/CMakeLists.txt || die |
| 43 |
+ -i src/*/CMakeLists.txt src/third-party/*/CMakeLists.txt || die |
| 44 |
|
| 45 |
use l10n_en || delete_voices alan bdl clb evgeniy-eng slt |
| 46 |
use l10n_eo || delete_voices spomenka |
| 47 |
@@ -116,6 +112,9 @@ src_configure() { |
| 48 |
# src/third-party/CMakeLists.txt |
| 49 |
#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml |
| 50 |
-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp |
| 51 |
+ # Hardening.cmake: don't mess with flags |
| 52 |
+ -DHARDENING_COMPILE_FLAGS= |
| 53 |
+ -DHARDENING_LINK_FLAGS= |
| 54 |
) |
| 55 |
|
| 56 |
cmake_src_configure |
Archives