public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anna Vyalkova" <cyber+gentoo@sysrq.in>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
Date: Mon,  8 Nov 2021 17:39:26 +0000 (UTC)	[thread overview]
Message-ID: <1636391990.b35c40c2fd6e98f28de0641d30b7849a5a46c08b.cybertailor@gentoo> (raw)

commit:     b35c40c2fd6e98f28de0641d30b7849a5a46c08b
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Nov  8 17:17:14 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Nov  8 17:19:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b35c40c2

app-accessibility/rhvoice: keep Hardening.cmake

Turns out it has options to not add weird flags.

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
index f593a64fa..e23f725d7 100644
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CMAKE_REMOVE_MODULES_LIST=( Hardening VersionFromGit )
+CMAKE_REMOVE_MODULES_LIST=( VersionFromGit )
 inherit cmake
 
 DESCRIPTION="TTS engine with extended languages support (including Russian)"
@@ -75,15 +75,11 @@ src_prepare() {
 		-i src/third-party/mage/CMakeLists.txt || die
 
 	sed -e "/include(VersionFromGit)/d" \
-		-e "/include(Hardening)/d" \
 		-e "/find_package(Sanitizers)/d" \
 		-e "/getVersionFromGit/d" \
-		-e "/harden/d" \
 		-i CMakeLists.txt || die
 	sed -e "/add_sanitizers/d" \
-		-e "/harden/d" \
-		-i src/*/CMakeLists.txt \
-		-i src/third-party/*/CMakeLists.txt || die
+		-i src/*/CMakeLists.txt src/third-party/*/CMakeLists.txt || die
 
 	use l10n_en || delete_voices alan bdl clb evgeniy-eng slt
 	use l10n_eo || delete_voices spomenka
@@ -116,6 +112,9 @@ src_configure() {
 		# src/third-party/CMakeLists.txt
 		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
 		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
+		# Hardening.cmake: don't mess with flags
+		-DHARDENING_COMPILE_FLAGS=
+		-DHARDENING_LINK_FLAGS=
 	)
 
 	cmake_src_configure


             reply	other threads:[~2021-11-08 17:39 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-08 17:39 Anna Vyalkova [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-05 11:55 [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/ Anna Vyalkova
2025-03-17 17:36 Anna Vyalkova
2024-10-07  0:31 Anna Vyalkova
2024-02-06  8:44 Anna Vyalkova
2024-02-06  8:44 Anna Vyalkova
2021-12-07  4:20 Anna Vyalkova
2021-11-08 17:39 Anna Vyalkova
2021-10-30  9:02 Anna Vyalkova
2021-10-02 18:17 Anna Vyalkova
2021-09-30 16:36 Anna Vyalkova
2021-07-15 10:04 Anna Vyalkova
2021-05-26  1:57 Anna Vyalkova
2021-05-22 15:21 Anna Vyalkova

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1636391990.b35c40c2fd6e98f28de0641d30b7849a5a46c08b.cybertailor@gentoo \
    --to=cyber+gentoo@sysrq.in \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox