dev-libs/libevent: use configure flags to disable samples/tests

We don't want to spend time compiling things that we aren't going to
use, so pass configure flags to disable them.

diff --git a/dev-libs/libevent/libevent-2.1.5-r4.ebuild b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
index 16300fc49e95ffb87935cef03fb1ec50b78c5547..4df26f29a320a2188774bf3bc43e64520e6293d3 100644 (file)
--- a/dev-libs/libevent/libevent-2.1.5-r4.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r4.ebuild
@@ -37,9 +37,6 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
        elibtoolize
        epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
-       # don't waste time building tests
-       # https://github.com/libevent/libevent/pull/144
-       sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -48,10 +45,12 @@ multilib_src_configure() {
 
        ECONF_SOURCE="${S}" \
        econf \
+               --disable-samples \
                $(use_enable debug debug-mode) \
                $(use_enable debug malloc-replacement) \
                $(use_enable ssl openssl) \
                $(use_enable static-libs static) \
+               $(use_enable test libevent-regress) \
                $(use_enable threads thread-support)
 }
 

diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 179af26b421f564a6ca66951e402cb37c2a6797e..c807cd329fc7cc8a2fee1f0fd074fa8b364b5cf6 100644 (file)
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -30,9 +30,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
        eautoreconf
-       # don't waste time building tests
-       # https://github.com/libevent/libevent/pull/144
-       sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -41,10 +38,12 @@ multilib_src_configure() {
 
        ECONF_SOURCE="${S}" \
        econf \
+               --disable-samples \
                $(use_enable debug debug-mode) \
                $(use_enable debug malloc-replacement) \
                $(use_enable ssl openssl) \
                $(use_enable static-libs static) \
+               $(use_enable test libevent-regress) \
                $(use_enable threads thread-support)
 }