From bda2b7e1dc20d5b9b4354cfb553e185590e55f50 Mon Sep 17 00:00:00 2001 From: OscarL Date: Sun, 8 Jan 2023 11:53:54 -0300 Subject: [PATCH] libevent: update to 2.1.12, disable static libs, depend on python3 (#7718) * libevent: update to 2.1.12, disable static libs, depend on python3 * libevent: disable old recipes, rename libevent21 to libevent. The old recipes are either unused, or used only by already broken packages. All enabled/usable recipes use the newer version already. * libevent: re-enabled libevent-1.4 for x86_gcc2, remove old 2.0 recipe --- dev-libs/libevent/libevent-1.4.14b.recipe | 4 +- dev-libs/libevent/libevent-2.0.21.recipe | 128 ------------------ ...21-2.1.8.recipe => libevent-2.1.12.recipe} | 44 +++--- 3 files changed, 26 insertions(+), 150 deletions(-) delete mode 100644 dev-libs/libevent/libevent-2.0.21.recipe rename dev-libs/libevent/{libevent21-2.1.8.recipe => libevent-2.1.12.recipe} (64%) diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index 754f83d93..685c46c70 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -16,8 +16,8 @@ CHECKSUM_SHA256="afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e4630 SOURCE_DIR="libevent-${portVersion}-stable" PATCHES="libevent-1.4.14b.patch" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" libevent$secondaryArchSuffix = $portVersion diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe deleted file mode 100644 index 6104910de..000000000 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ /dev/null @@ -1,128 +0,0 @@ -SUMMARY="An event notification library" -DESCRIPTION="The libevent API provides a mechanism to execute a callback \ -function when a specific event occurs on a file descriptor or after a \ -timeout has been reached. Furthermore, libevent also support callbacks due \ -to signals or regular timeouts. -libevent is meant to replace the event loop found in event driven network \ -servers. An application just needs to call event_dispatch() and then add or \ -remove events dynamically without having to change the event loop." -HOMEPAGE="http://www.libevent.org/" -COPYRIGHT="2000-2007 Niels Provos - 2005 Nick Mathewson, and other contributors." -LICENSE="BSD (3-clause)" -REVISION="16" -SOURCE_URI="https://github.com/downloads/libevent/libevent/libevent-$portVersion-stable.tar.gz" -CHECKSUM_SHA256="22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5" -SOURCE_DIR="libevent-${portVersion}-stable" -PATCHES="libevent-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - libevent${secondaryArchSuffix} = ${portVersion} - lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - " - -PROVIDES_devel=" - libevent${secondaryArchSuffix}_devel = $portVersion - cmd:event_rpcgen.py$secondaryArchSuffix - devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 - devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent$secondaryArchSuffix = $portVersion - lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 - " -REQUIRES_devel=" - libevent$secondaryArchSuffix == $portVersion base - cmd:python3.7 - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libz - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:awk - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:python3.7 - " - -BUILD() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in - sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am - - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - - export CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" - export CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS" - export LDFLAGS="-lposix_error_mapper -lnetwork" - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - rm $libDir/libevent*.la - - prepareInstalledDevelLibs \ - libevent \ - libevent_core \ - libevent_extra \ - libevent_pthreads \ - libevent_openssl - - cp .libs/libevent-*.so* \ - .libs/libevent_core-*.so* \ - .libs/libevent_extra-*.so* \ - .libs/libevent_pthreads-*.so* \ - .libs/libevent_openssl-*.so* \ - $developLibDir - fixPkgconfig - - # devel package - packageEntries devel \ - $binDir \ - $developDir -} diff --git a/dev-libs/libevent/libevent21-2.1.8.recipe b/dev-libs/libevent/libevent-2.1.12.recipe similarity index 64% rename from dev-libs/libevent/libevent21-2.1.8.recipe rename to dev-libs/libevent/libevent-2.1.12.recipe index 5ffb4e71d..986d31842 100644 --- a/dev-libs/libevent/libevent21-2.1.8.recipe +++ b/dev-libs/libevent/libevent-2.1.12.recipe @@ -10,21 +10,24 @@ HOMEPAGE="http://www.libevent.org/" COPYRIGHT="2000-2007 Niels Provos 2005 Nick Mathewson, and other contributors." LICENSE="BSD (3-clause)" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/libevent/libevent/releases/download/release-$portVersion-stable/libevent-$portVersion-stable.tar.gz" -CHECKSUM_SHA256="965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" +CHECKSUM_SHA256="92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb" SOURCE_DIR="libevent-${portVersion}-stable" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="7.0.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libevent21${secondaryArchSuffix} = ${portVersion} - lib:libevent_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - lib:libevent_core_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - lib:libevent_extra_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - lib:libevent_openssl_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - lib:libevent_pthreads_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 + lib:libevent_2.1$secondaryArchSuffix = $libVersionCompat + lib:libevent_core_2.1$secondaryArchSuffix = $libVersionCompat + lib:libevent_extra_2.1$secondaryArchSuffix = $libVersionCompat + lib:libevent_openssl_2.1$secondaryArchSuffix = $libVersionCompat + lib:libevent_pthreads_2.1$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -35,20 +38,20 @@ REQUIRES=" PROVIDES_devel=" libevent21${secondaryArchSuffix}_devel = ${portVersion} cmd:event_rpcgen.py$secondaryArchSuffix - devel:libevent$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_core$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_core_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_extra$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_extra_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_openssl$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_openssl_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_pthreads$secondaryArchSuffix = 6.0.2 compat >= 6 - devel:libevent_pthreads_2.1$secondaryArchSuffix = 6.0.2 compat >= 6 + devel:libevent$secondaryArchSuffix = $libVersionCompat + devel:libevent_2.1$secondaryArchSuffix = $libVersionCompat + devel:libevent_core$secondaryArchSuffix = $libVersionCompat + devel:libevent_core_2.1$secondaryArchSuffix = $libVersionCompat + devel:libevent_extra$secondaryArchSuffix = $libVersionCompat + devel:libevent_extra_2.1$secondaryArchSuffix = $libVersionCompat + devel:libevent_openssl$secondaryArchSuffix = $libVersionCompat + devel:libevent_openssl_2.1$secondaryArchSuffix = $libVersionCompat + devel:libevent_pthreads$secondaryArchSuffix = $libVersionCompat + devel:libevent_pthreads_2.1$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libevent21$secondaryArchSuffix == $portVersion base - cmd:python + cmd:python3 devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix " @@ -71,7 +74,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make - cmd:python + cmd:python3 " BUILD() @@ -79,7 +82,8 @@ BUILD() autoreconf -fi CPPFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE" \ - LDFLAGS="-lbsd -lposix_error_mapper -lnetwork" runConfigure ./configure + LDFLAGS="-lbsd -lposix_error_mapper -lnetwork" \ + runConfigure ./configure --disable-static make $jobArgs }