| 1 |
commit: a245b6b7b1c3ad557610262c28eadb3bbc2ed19a |
| 2 |
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 13:50:52 2022 +0000 |
| 4 |
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 01:02:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a245b6b7 |
| 7 |
|
| 8 |
sys-libs/libselinux: make pcre2 unconditional |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/837986 |
| 11 |
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/libselinux/libselinux-9999.ebuild | 19 +++++++++---------- |
| 14 |
1 file changed, 9 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild |
| 17 |
index 90b74872231d..e2a73b254d7b 100644 |
| 18 |
--- a/sys-libs/libselinux/libselinux-9999.ebuild |
| 19 |
+++ b/sys-libs/libselinux/libselinux-9999.ebuild |
| 20 |
@@ -26,12 +26,11 @@ fi |
| 21 |
|
| 22 |
LICENSE="public-domain" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="+pcre2 python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" |
| 25 |
+IUSE="python ruby static-libs ruby_targets_ruby26 ruby_targets_ruby27" |
| 26 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 27 |
|
| 28 |
-RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] |
| 29 |
- !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 30 |
- pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
| 31 |
+RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] |
| 32 |
+ >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] |
| 33 |
python? ( ${PYTHON_DEPS} ) |
| 34 |
ruby? ( |
| 35 |
ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) |
| 36 |
@@ -58,7 +57,7 @@ multilib_src_compile() { |
| 37 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 38 |
SHLIBDIR="/$(get_libdir)" \ |
| 39 |
LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ |
| 40 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 41 |
+ USE_PCRE2=y \ |
| 42 |
FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 43 |
all |
| 44 |
|
| 45 |
@@ -68,7 +67,7 @@ multilib_src_compile() { |
| 46 |
LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 47 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 48 |
SHLIBDIR="/$(get_libdir)" \ |
| 49 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 50 |
+ USE_PCRE2=y \ |
| 51 |
FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 52 |
pywrap |
| 53 |
} |
| 54 |
@@ -85,7 +84,7 @@ multilib_src_compile() { |
| 55 |
LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ |
| 56 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 57 |
SHLIBDIR="/$(get_libdir)" \ |
| 58 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 59 |
+ USE_PCRE2=y \ |
| 60 |
FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ |
| 61 |
rubywrap |
| 62 |
} |
| 63 |
@@ -101,7 +100,7 @@ multilib_src_install() { |
| 64 |
emake DESTDIR="${D}" \ |
| 65 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 66 |
SHLIBDIR="/$(get_libdir)" \ |
| 67 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 68 |
+ USE_PCRE2=y \ |
| 69 |
install |
| 70 |
|
| 71 |
if multilib_is_native_abi && use python; then |
| 72 |
@@ -109,7 +108,7 @@ multilib_src_install() { |
| 73 |
emake DESTDIR="${D}" \ |
| 74 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 75 |
SHLIBDIR="/$(get_libdir)" \ |
| 76 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 77 |
+ USE_PCRE2=y \ |
| 78 |
install-pywrap |
| 79 |
python_optimize # bug 531638 |
| 80 |
} |
| 81 |
@@ -125,7 +124,7 @@ multilib_src_install() { |
| 82 |
LIBDIR="\$(PREFIX)/$(get_libdir)" \ |
| 83 |
SHLIBDIR="/$(get_libdir)" \ |
| 84 |
RUBY=${1} \ |
| 85 |
- USE_PCRE2="$(usex pcre2 y n)" \ |
| 86 |
+ USE_PCRE2=y \ |
| 87 |
install-rubywrap |
| 88 |
} |
| 89 |
for RUBYTARGET in ${USE_RUBY}; do |
Archives