| 1 |
commit: ce8c5ced6f2dd5150bbfb248015f92bbffb1959f |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Fri Nov 12 08:33:57 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 22 10:08:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8c5ced |
| 7 |
|
| 8 |
mail-filter/rspamd: make USE=jit to control only PCRE JIT support |
| 9 |
|
| 10 |
It is valid configuration to use JIT enabled PCRE with non-JIT Lua and |
| 11 |
vice versa, as it was pointed out in a bug report. Therefore, this |
| 12 |
change removes |
| 13 |
|
| 14 |
jit? ( lua_single_target_luajit ) |
| 15 |
|
| 16 |
restriction from all available ebuilds. |
| 17 |
|
| 18 |
Closes: https://bugs.gentoo.org/822765 |
| 19 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/22915 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
mail-filter/rspamd/metadata.xml | 1 + |
| 24 |
mail-filter/rspamd/rspamd-2.7-r103.ebuild | 3 +-- |
| 25 |
mail-filter/rspamd/rspamd-3.0-r3.ebuild | 1 - |
| 26 |
mail-filter/rspamd/rspamd-3.1.ebuild | 1 - |
| 27 |
mail-filter/rspamd/rspamd-9999.ebuild | 1 - |
| 28 |
5 files changed, 2 insertions(+), 5 deletions(-) |
| 29 |
|
| 30 |
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml |
| 31 |
index a183078256ab..78a3ccc54c80 100644 |
| 32 |
--- a/mail-filter/rspamd/metadata.xml |
| 33 |
+++ b/mail-filter/rspamd/metadata.xml |
| 34 |
@@ -18,5 +18,6 @@ |
| 35 |
</upstream> |
| 36 |
<use> |
| 37 |
<flag name="pcre2">Use dev-libs/libpcre2</flag> |
| 38 |
+ <flag name="jit">Enable PCRE JIT support</flag> |
| 39 |
</use> |
| 40 |
</pkgmetadata> |
| 41 |
|
| 42 |
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild b/mail-filter/rspamd/rspamd-2.7-r103.ebuild |
| 43 |
index 8a361f82f03e..e3e4d0e59f1e 100644 |
| 44 |
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild |
| 45 |
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild |
| 46 |
@@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain u |
| 47 |
SLOT="0" |
| 48 |
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" |
| 49 |
|
| 50 |
-REQUIRED_USE="${LUA_REQUIRED_USE} |
| 51 |
- jit? ( lua_single_target_luajit )" |
| 52 |
+REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 53 |
|
| 54 |
RDEPEND="${LUA_DEPS} |
| 55 |
$(lua_gen_cond_dep ' |
| 56 |
|
| 57 |
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild b/mail-filter/rspamd/rspamd-3.0-r3.ebuild |
| 58 |
index 1ff4af0796ec..54434e12ad55 100644 |
| 59 |
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild |
| 60 |
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild |
| 61 |
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" |
| 62 |
|
| 63 |
# A part of tests use ffi luajit extension |
| 64 |
REQUIRED_USE="${LUA_REQUIRED_USE} |
| 65 |
- jit? ( lua_single_target_luajit ) |
| 66 |
test? ( lua_single_target_luajit )" |
| 67 |
|
| 68 |
RDEPEND="${LUA_DEPS} |
| 69 |
|
| 70 |
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1.ebuild |
| 71 |
index df5d75abfd0e..3d43ffe54025 100644 |
| 72 |
--- a/mail-filter/rspamd/rspamd-3.1.ebuild |
| 73 |
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild |
| 74 |
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" |
| 75 |
|
| 76 |
# A part of tests use ffi luajit extension |
| 77 |
REQUIRED_USE="${LUA_REQUIRED_USE} |
| 78 |
- jit? ( lua_single_target_luajit ) |
| 79 |
test? ( lua_single_target_luajit )" |
| 80 |
|
| 81 |
RDEPEND="${LUA_DEPS} |
| 82 |
|
| 83 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
| 84 |
index df5d75abfd0e..3d43ffe54025 100644 |
| 85 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
| 86 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
| 87 |
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )" |
| 88 |
|
| 89 |
# A part of tests use ffi luajit extension |
| 90 |
REQUIRED_USE="${LUA_REQUIRED_USE} |
| 91 |
- jit? ( lua_single_target_luajit ) |
| 92 |
test? ( lua_single_target_luajit )" |
| 93 |
|
| 94 |
RDEPEND="${LUA_DEPS} |
Archives