Date: Wednesday, August 3, 2022 @ 20:01:10 Author: heftig Revision: 1260152
2.1.12-2: match libevent, use cmake Added: lib32-libevent/trunk/EVENT__SIZEOF_TIME_T.patch lib32-libevent/trunk/keys/ lib32-libevent/trunk/keys/pgp/ lib32-libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc lib32-libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc lib32-libevent/trunk/multilib.diff Modified: lib32-libevent/trunk/PKGBUILD -------------------------------------------------------+ EVENT__SIZEOF_TIME_T.patch | 37 +++++ PKGBUILD | 62 ++++++-- keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc | 1 keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc | 1 multilib.diff | 111 ++++++++++++++++ 5 files changed, 192 insertions(+), 20 deletions(-) Added: EVENT__SIZEOF_TIME_T.patch =================================================================== --- EVENT__SIZEOF_TIME_T.patch (rev 0) +++ EVENT__SIZEOF_TIME_T.patch 2022-08-03 20:01:10 UTC (rev 1260152) @@ -0,0 +1,37 @@ +From f5ad737d73ed18b95ce63f1d8e933a89a26653e9 Mon Sep 17 00:00:00 2001 +From: Azat Khuzhin <[email protected]> +Date: Sat, 9 Jul 2022 14:22:38 +0300 +Subject: [PATCH] Add -Wundef for cmake and fix EVENT__SIZEOF_TIME_T usage + +Note, autotools already supports it. +--- + CMakeLists.txt | 1 + + event-config.h.cmake | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ee0df2f7..9237252c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -295,6 +295,7 @@ if (${GNUC}) + + list(APPEND __FLAGS + -Wall -Wextra -Wno-unused-parameter -Wstrict-aliasing -Wstrict-prototypes ++ -Wundef + + -fno-strict-aliasing # gcc 2.9.5+ + -Wmissing-prototypes +diff --git a/event-config.h.cmake b/event-config.h.cmake +index 9fff34877..4a6267017 100644 +--- a/event-config.h.cmake ++++ b/event-config.h.cmake +@@ -485,6 +485,9 @@ + /* The size of 'void *', as computer by sizeof */ + #define EVENT__SIZEOF_VOID_P @EVENT__SIZEOF_VOID_P@ + ++/* The size of 'time_t', as computer by sizeof */ ++#define EVENT__SIZEOF_TIME_T @EVENT__SIZEOF_TIME_T@ ++ + /* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ + #ifndef __cplusplus Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-03 19:31:09 UTC (rev 1260151) +++ PKGBUILD 2022-08-03 20:01:10 UTC (rev 1260152) @@ -2,42 +2,64 @@ # Contributor: Tom Gundersen <[email protected]> # Contributor: Judd <[email protected]> -_pkgbasename=libevent pkgname=lib32-libevent pkgver=2.1.12 -pkgrel=1 -pkgdesc="An event notification library (32-bit)" -arch=('x86_64') -url="http://libevent.org/"; -license=('BSD') -depends=('lib32-openssl') -source=(https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/$_pkgbasename-$pkgver-stable.tar.gz{,.asc}) +pkgrel=2 +pkgdesc="Event notification library (32-bit)" +url="https://libevent.org/"; +arch=(x86_64) +license=(BSD) +depends=(lib32-openssl libevent) +makedepends=(cmake ninja python lib32-zlib) +options=(debug) +source=( + https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz{,.asc} + EVENT__SIZEOF_TIME_T.patch + multilib.diff +) sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb' - 'SKIP') + 'SKIP' + '945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf' + '4a28281e4dad7651db9167e7740d334274abbf762a03bcd41de4e075acde0e82') validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA' '9E3AC83A27974B84D1B3401DB86086848EF8686D') +prepare() { + cd libevent-$pkgver-stable + + # Fix Firefox build + patch -Np1 -i ../EVENT__SIZEOF_TIME_T.patch + + # Install to /usr/lib32 + patch -Np1 -i ../multilib.diff +} + build() { export CC="gcc -m32" export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export PKG_CONFIG="i686-pc-linux-gnu-pkg-config" - cd ${_pkgbasename}-${pkgver}-stable - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc --disable-libevent-regress --libdir=/usr/lib32 - make + cmake -S libevent-$pkgver-stable -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ + -DEVENT__LIBRARY_TYPE=SHARED \ + -DEVENT__DISABLE_REGRESS=OFF \ + -DEVENT__DOXYGEN=OFF + cmake --build build } check() { - cd ${_pkgbasename}-${pkgver}-stable - make -j1 check + cd build + ctest --output-on-failure --stop-on-failure -j$(nproc) } package() { - cd ${_pkgbasename}-${pkgver}-stable - make DESTDIR="${pkgdir}" install + provides=(libevent{,_core,_extra,_openssl,_pthreads}-2.1.so) - rm -rf "${pkgdir}"/usr/{bin,include} + DESTDIR="$pkgdir" cmake --install build - install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + rm -r "$pkgdir"/usr/{bin,include} + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libevent-$pkgver-stable/LICENSE } Added: keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc =================================================================== (Binary files differ) Index: lib32-libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc =================================================================== --- keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc 2022-08-03 19:31:09 UTC (rev 1260151) +++ keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc 2022-08-03 20:01:10 UTC (rev 1260152) Property changes on: lib32-libevent/trunk/keys/pgp/9E3AC83A27974B84D1B3401DB86086848EF8686D.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Added: keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc =================================================================== (Binary files differ) Index: lib32-libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc =================================================================== --- keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc 2022-08-03 19:31:09 UTC (rev 1260151) +++ keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc 2022-08-03 20:01:10 UTC (rev 1260152) Property changes on: lib32-libevent/trunk/keys/pgp/B35BF85BF19489D04E28C33C21194EBB165733EA.asc ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/pgp-keys \ No newline at end of property Added: multilib.diff =================================================================== --- multilib.diff (rev 0) +++ multilib.diff 2022-08-03 20:01:10 UTC (rev 1260152) @@ -0,0 +1,111 @@ +diff -u -r libevent-2.1.12-stable/CMakeLists.txt libevent-2.1.12-stable-lib32/CMakeLists.txt +--- libevent-2.1.12-stable/CMakeLists.txt 2020-07-05 12:01:34.000000000 +0000 ++++ libevent-2.1.12-stable-lib32/CMakeLists.txt 2022-08-03 19:36:07.559379519 +0000 +@@ -162,10 +162,10 @@ + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + endif() + if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib32) + endif() + if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib32) + endif() + + if (EVENT__ENABLE_VERBOSE_DEBUG) +@@ -1453,7 +1453,7 @@ + # + + set(EVENT_INSTALL_CMAKE_DIR +- "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent") ++ "${CMAKE_INSTALL_PREFIX}/lib32/cmake/libevent") + + export(PACKAGE libevent) + +diff -u -r libevent-2.1.12-stable/cmake/AddEventLibrary.cmake libevent-2.1.12-stable-lib32/cmake/AddEventLibrary.cmake +--- libevent-2.1.12-stable/cmake/AddEventLibrary.cmake 2020-07-05 12:01:34.000000000 +0000 ++++ libevent-2.1.12-stable-lib32/cmake/AddEventLibrary.cmake 2022-08-03 19:49:24.253528837 +0000 +@@ -13,7 +13,7 @@ + macro(generate_pkgconfig LIB_NAME) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +- set(libdir ${CMAKE_INSTALL_PREFIX}/lib) ++ set(libdir ${CMAKE_INSTALL_PREFIX}/lib32) + set(includedir ${CMAKE_INSTALL_PREFIX}/include) + + set(VERSION ${EVENT_ABI_LIBVERSION}) +@@ -31,7 +31,7 @@ + configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib32/pkgconfig" + ) + endmacro() + +@@ -40,9 +40,9 @@ + macro(export_install_target TYPE LIB_NAME OUTER_INCLUDES) + if("${LIB_NAME}" STREQUAL "event") + install(TARGETS "${LIB_NAME}_${TYPE}" +- LIBRARY DESTINATION "lib" COMPONENT lib +- ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ LIBRARY DESTINATION "lib32" COMPONENT lib ++ ARCHIVE DESTINATION "lib32" COMPONENT lib ++ RUNTIME DESTINATION "lib32" COMPONENT lib + COMPONENT dev + ) + else() +@@ -67,9 +67,9 @@ + ) + install(TARGETS "${LIB_NAME}_${TYPE}" + EXPORT LibeventTargets-${TYPE} +- LIBRARY DESTINATION "lib" COMPONENT lib +- ARCHIVE DESTINATION "lib" COMPONENT lib +- RUNTIME DESTINATION "lib" COMPONENT lib ++ LIBRARY DESTINATION "lib32" COMPONENT lib ++ ARCHIVE DESTINATION "lib32" COMPONENT lib ++ RUNTIME DESTINATION "lib32" COMPONENT lib + COMPONENT dev + ) + endif() +@@ -150,7 +150,7 @@ + set_target_properties( + "${LIB_NAME}_shared" PROPERTIES + OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}.${CURRENT_MINUS_AGE}" +- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" ++ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib32" + LINK_FLAGS "-compatibility_version ${COMPATIBILITY_VERSION} -current_version ${COMPATIBILITY_VERSION}.${EVENT_ABI_LIBVERSION_REVISION}") + else() + math(EXPR CURRENT_MINUS_AGE "${EVENT_ABI_LIBVERSION_CURRENT}-${EVENT_ABI_LIBVERSION_AGE}") +@@ -159,7 +159,7 @@ + OUTPUT_NAME "${LIB_NAME}-${EVENT_PACKAGE_RELEASE}" + VERSION "${CURRENT_MINUS_AGE}.${EVENT_ABI_LIBVERSION_AGE}.${EVENT_ABI_LIBVERSION_REVISION}" + SOVERSION "${CURRENT_MINUS_AGE}" +- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib32") + endif() + + if (NOT WIN32) +@@ -181,7 +181,7 @@ + if (NOT WIN32) + install(FILES + "$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}" +- DESTINATION "lib" ++ DESTINATION "lib32" + COMPONENT lib) + endif() + endif() +diff -u -r libevent-2.1.12-stable/cmake/LibeventConfig.cmake.in libevent-2.1.12-stable-lib32/cmake/LibeventConfig.cmake.in +--- libevent-2.1.12-stable/cmake/LibeventConfig.cmake.in 2020-07-05 12:01:34.000000000 +0000 ++++ libevent-2.1.12-stable-lib32/cmake/LibeventConfig.cmake.in 2022-08-03 19:35:46.016109621 +0000 +@@ -130,7 +130,7 @@ + unset(_event_lib CACHE) + find_library(_event_lib + NAMES "event_${_comp}" +- PATHS "${_INSTALL_PREFIX}/lib" ++ PATHS "${_INSTALL_PREFIX}/lib32" + NO_DEFAULT_PATH) + if(_event_lib) + list(APPEND LIBEVENT_LIBRARIES "libevent::${_comp}")
