| 1 |
commit: e2c402d072037075abed4a76de937b305d2dfc73 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 1 20:07:42 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 1 20:07:42 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c402d0 |
| 7 |
|
| 8 |
www-servers/monkeyd: remove uclibc |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild | 13 +------------ |
| 13 |
www-servers/monkeyd/monkeyd-9999.ebuild | 13 +------------ |
| 14 |
2 files changed, 2 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild |
| 17 |
index 0be511e56215..574514f722de 100644 |
| 18 |
--- a/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild |
| 19 |
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -25,11 +25,8 @@ SLOT="0" |
| 27 |
PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" |
| 28 |
IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}" |
| 29 |
|
| 30 |
-# uclibc is often compiled without backtrace info so we should |
| 31 |
-# force this off. If someone complains, consider relaxing it. |
| 32 |
REQUIRED_USE=" |
| 33 |
monkeyd_plugins_tls? ( !static-plugins ) |
| 34 |
- elibc_uclibc? ( !debug ) |
| 35 |
cgi? ( php )" |
| 36 |
|
| 37 |
#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" |
| 38 |
@@ -68,7 +65,6 @@ src_configure() { |
| 39 |
append-cflags -fcommon |
| 40 |
local myconf="" |
| 41 |
|
| 42 |
- use elibc_uclibc && myconf+=" --uclib-mode" |
| 43 |
use elibc_musl && myconf+=" --musl-mode" |
| 44 |
|
| 45 |
#use jemalloc || myconf+=" --malloc-libc" |
| 46 |
@@ -98,13 +94,6 @@ src_configure() { |
| 47 |
myconf+=" --static-plugins=${enable_plugins%,}" |
| 48 |
fi |
| 49 |
|
| 50 |
- # For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc, |
| 51 |
- # but shouldn't because it is POSIX. This needs to be fixed |
| 52 |
- # in uClibc. Also, we really should us append-cppflags but |
| 53 |
- # monkey's build system doesn't respect CPPFLAGS. This needs |
| 54 |
- # to be fixed in monkey. |
| 55 |
- use elibc_uclibc && append-cflags -D_GNU_SOURCE |
| 56 |
- |
| 57 |
# Non-autotools configure |
| 58 |
./configure \ |
| 59 |
--pthread-tls \ |
| 60 |
|
| 61 |
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild |
| 62 |
index 3308111d6ea3..a0b187211a62 100644 |
| 63 |
--- a/www-servers/monkeyd/monkeyd-9999.ebuild |
| 64 |
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-# Copyright 1999-2021 Gentoo Authors |
| 67 |
+# Copyright 1999-2022 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
@@ -25,11 +25,8 @@ SLOT="0" |
| 72 |
PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls" |
| 73 |
IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}" |
| 74 |
|
| 75 |
-# uclibc is often compiled without backtrace info so we should |
| 76 |
-# force this off. If someone complains, consider relaxing it. |
| 77 |
REQUIRED_USE=" |
| 78 |
monkeyd_plugins_tls? ( !static-plugins ) |
| 79 |
- elibc_uclibc? ( !debug ) |
| 80 |
cgi? ( php )" |
| 81 |
|
| 82 |
#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" |
| 83 |
@@ -68,7 +65,6 @@ src_configure() { |
| 84 |
append-cflags -fcommon |
| 85 |
local myconf="" |
| 86 |
|
| 87 |
- use elibc_uclibc && myconf+=" --uclib-mode" |
| 88 |
use elibc_musl && myconf+=" --musl-mode" |
| 89 |
|
| 90 |
#use jemalloc || myconf+=" --malloc-libc" |
| 91 |
@@ -98,13 +94,6 @@ src_configure() { |
| 92 |
myconf+=" --static-plugins=${enable_plugins%,}" |
| 93 |
fi |
| 94 |
|
| 95 |
- # For O_CLOEXEC which is guarded by _GNU_SOURCE in uClibc, |
| 96 |
- # but shouldn't because it is POSIX. This needs to be fixed |
| 97 |
- # in uClibc. Also, we really should us append-cppflags but |
| 98 |
- # monkey's build system doesn't respect CPPFLAGS. This needs |
| 99 |
- # to be fixed in monkey. |
| 100 |
- use elibc_uclibc && append-cflags -D_GNU_SOURCE |
| 101 |
- |
| 102 |
# Non-autotools configure |
| 103 |
./configure \ |
| 104 |
--pthread-tls \ |
Archives