1 |
commit: 45c18da33fe7f9ec1d9eb61d8c60406a867c63bb |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Mon Nov 29 18:37:39 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 1 20:02:18 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c18da3 |
7 |
|
8 |
mail-filter/rspamd: respect user compiler flags choice |
9 |
|
10 |
The Toolset.cmake file seems to be unnecessary, it tries to control |
11 |
flags which in Gentoo should be controlled by user. This applies a |
12 |
change suggested in [1]. |
13 |
|
14 |
[1] https://bugs.gentoo.org/827550#c1 |
15 |
|
16 |
Closes: https://bugs.gentoo.org/827550 |
17 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
18 |
Closes: https://github.com/gentoo/gentoo/pull/23127 |
19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
20 |
|
21 |
mail-filter/rspamd/rspamd-3.1.ebuild | 2 ++ |
22 |
mail-filter/rspamd/rspamd-9999.ebuild | 2 ++ |
23 |
2 files changed, 4 insertions(+) |
24 |
|
25 |
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild |
26 |
index 3d43ffe54025..b4d4c6d23bae 100644 |
27 |
--- a/mail-filter/rspamd/rspamd-3.1.ebuild |
28 |
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild |
29 |
@@ -68,6 +68,8 @@ src_prepare() { |
30 |
|
31 |
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die |
32 |
|
33 |
+ > cmake/Toolset.cmake || die #827550 |
34 |
+ |
35 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
36 |
rspamd.service \ |
37 |
|| die |
38 |
|
39 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
40 |
index 3d43ffe54025..b4d4c6d23bae 100644 |
41 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
42 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
43 |
@@ -68,6 +68,8 @@ src_prepare() { |
44 |
|
45 |
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die |
46 |
|
47 |
+ > cmake/Toolset.cmake || die #827550 |
48 |
+ |
49 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
50 |
rspamd.service \ |
51 |
|| die |