diff options
author | Gonzalo Exequiel Pedone | 2024-03-02 21:45:03 -0300 |
---|---|---|
committer | Gonzalo Exequiel Pedone | 2024-03-02 21:45:03 -0300 |
commit | ef1259423ba4bf885540e85cbd4f390b367ee81a (patch) | |
tree | aae39b3c8360e1d82030fd148a350b6989355cb5 | |
parent | 75b07946718b0c5d4a1e44644f3138816ba5868e (diff) | |
download | aur-ef1259423ba4bf885540e85cbd4f390b367ee81a.tar.gz |
Enabled pthreads support.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-Force-compile-with-pthreads.patch | 28 | ||||
-rw-r--r-- | PKGBUILD | 16 |
3 files changed, 42 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = android-x86-libevent pkgdesc = Event notification library (android) pkgver = 2.1.12 - pkgrel = 1 + pkgrel = 2 url = https://libevent.org/ arch = any license = BSD @@ -16,9 +16,11 @@ pkgbase = android-x86-libevent options = !emptydirs source = https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz source = https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz.asc + source = 0001-Force-compile-with-pthreads.patch validpgpkeys = B35BF85BF19489D04E28C33C21194EBB165733EA validpgpkeys = 9E3AC83A27974B84D1B3401DB86086848EF8686D sha256sums = 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb sha256sums = SKIP + sha256sums = a102b8359dd36e8823c3dde23a1d39ffa758cc68c3cbfa6b65633990cec0ecac pkgname = android-x86-libevent diff --git a/0001-Force-compile-with-pthreads.patch b/0001-Force-compile-with-pthreads.patch new file mode 100644 index 000000000000..5f6b551f8425 --- /dev/null +++ b/0001-Force-compile-with-pthreads.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -859,14 +859,7 @@ + if (WIN32) + list(APPEND SRC_CORE evthread_win32.c) + else() +- find_package(Threads REQUIRED) +- if (NOT CMAKE_USE_PTHREADS_INIT) +- message(FATAL_ERROR +- "Failed to find Pthreads, set EVENT__DISABLE_THREAD_SUPPORT to disable") +- endif() +- + set(EVENT__HAVE_PTHREADS 1) +- list(APPEND LIB_APPS ${CMAKE_THREAD_LIBS_INIT}) + endif() + endif() + +@@ -1152,9 +1145,7 @@ + if (NOT EVENT__DISABLE_OPENSSL) + target_link_libraries(regress event_openssl) + endif() +- if (CMAKE_USE_PTHREADS_INIT) +- target_link_libraries(regress event_pthreads) +- endif() ++ target_link_libraries(regress event_pthreads) + else() + message(WARNING "No suitable Python interpreter found, cannot generate regress tests!") + endif() @@ -6,7 +6,7 @@ _android_arch=x86 pkgname=android-${_android_arch}-libevent pkgver=2.1.12 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Event notification library (android)" url="https://libevent.org/" @@ -17,12 +17,20 @@ makedepends=("android-${_android_arch}-zlib" 'python') optdepends=('python: event_rpcgen.py') options=(!strip !buildflags staticlibs !emptydirs) -source=("https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz"{,.asc}) +source=("https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz"{,.asc} + '0001-Force-compile-with-pthreads.patch') sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb' - 'SKIP') + 'SKIP' + 'a102b8359dd36e8823c3dde23a1d39ffa758cc68c3cbfa6b65633990cec0ecac') validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA' '9E3AC83A27974B84D1B3401DB86086848EF8686D') +prepare() { + cd "${srcdir}/libevent-$pkgver-stable" + + patch -Np1 -i ../0001-Force-compile-with-pthreads.patch +} + build() { cd "${srcdir}/libevent-$pkgver-stable" source android-env ${_android_arch} @@ -36,7 +44,6 @@ build() { -DEVENT__LIBRARY_TYPE=SHARED \ -DEVENT__DISABLE_REGRESS=OFF \ -DEVENT__DOXYGEN=OFF \ - -DEVENT__DISABLE_THREAD_SUPPORT=ON \ -DEVENT__DISABLE_TESTS=ON \ -DEVENT__DISABLE_SAMPLES=ON \ -DOPENSSL_ROOT_DIR="${ANDROID_PREFIX}" \ @@ -55,7 +62,6 @@ build() { -DEVENT__LIBRARY_TYPE=STATIC \ -DEVENT__DISABLE_REGRESS=OFF \ -DEVENT__DOXYGEN=OFF \ - -DEVENT__DISABLE_THREAD_SUPPORT=ON \ -DEVENT__DISABLE_TESTS=ON \ -DEVENT__DISABLE_SAMPLES=ON \ -DOPENSSL_ROOT_DIR="${ANDROID_PREFIX}" \ |