diff --git a/rocky9/Dockerfile b/rocky9/Dockerfile index ff3c200..e4417bf 100644 --- a/rocky9/Dockerfile +++ b/rocky9/Dockerfile @@ -78,11 +78,11 @@ RUN --mount=type=bind,from=sources,source=openssl-openssl-3.0.15.tar.gz,target=/ && cd .. \ && rm -rf src -COPY libevent-lib64-install.patch /tmp/ +COPY libevent-libdir-install.patch /tmp/ RUN --mount=type=bind,from=sources,source=libevent-release-2.1.12-stable.tar.gz,target=/tmp/libevent.tar.gz \ mkdir src \ && tar --extract --gzip --file=/tmp/libevent.tar.gz --directory=src --strip-components=1 \ - && git -C src apply /tmp/libevent-lib64-install.patch \ + && git -C src apply /tmp/libevent-libdir-install.patch \ && cmake -G Ninja -S src -B build -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DEVENT__DISABLE_BENCHMARK=ON \ @@ -91,7 +91,7 @@ RUN --mount=type=bind,from=sources,source=libevent-release-2.1.12-stable.tar.gz, -DEVENT__DISABLE_TESTS=ON \ -DEVENT__LIBRARY_TYPE=STATIC \ && cmake --build build --parallel "$(nproc)" --target install \ - && rm -rf build src /tmp/libevent-lib64-install.patch + && rm -rf build src /tmp/libevent-libdir-install.patch RUN --mount=type=bind,from=sources,source=zstd-v1.5.7.tar.gz,target=/tmp/zstd.tar.gz \ mkdir src \ diff --git a/rocky9/libevent-lib64-install.patch b/rocky9/libevent-libdir-install.patch similarity index 57% rename from rocky9/libevent-lib64-install.patch rename to rocky9/libevent-libdir-install.patch index c71f021..f46b023 100644 --- a/rocky9/libevent-lib64-install.patch +++ b/rocky9/libevent-libdir-install.patch @@ -1,12 +1,11 @@ -diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake ---- a/cmake/AddEventLibrary.cmake 2026-09-17 14:40:01.091049579 +0800 -+++ b/cmake/AddEventLibrary.cmake 2026-09-17 14:40:01.103049846 +0800 +--- a/cmake/AddEventLibrary.cmake ++++ b/cmake/AddEventLibrary.cmake @@ -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}/lib64/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" ) endmacro() @@ -17,9 +16,9 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake - LIBRARY DESTINATION "lib" COMPONENT lib - ARCHIVE DESTINATION "lib" COMPONENT lib - RUNTIME DESTINATION "lib" COMPONENT lib -+ LIBRARY DESTINATION "lib64" COMPONENT lib -+ ARCHIVE DESTINATION "lib64" COMPONENT lib -+ RUNTIME DESTINATION "lib64" COMPONENT lib ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib ++ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib COMPONENT dev ) else() @@ -30,9 +29,9 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake - LIBRARY DESTINATION "lib" COMPONENT lib - ARCHIVE DESTINATION "lib" COMPONENT lib - RUNTIME DESTINATION "lib" COMPONENT lib -+ LIBRARY DESTINATION "lib64" COMPONENT lib -+ ARCHIVE DESTINATION "lib64" COMPONENT lib -+ RUNTIME DESTINATION "lib64" COMPONENT lib ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib ++ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib COMPONENT dev ) endif() @@ -41,19 +40,26 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake install(FILES "$/${LIB_LINK_NAME}" - DESTINATION "lib" -+ DESTINATION "lib64" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib) endif() endif() -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2026-09-17 14:40:01.091049579 +0800 -+++ b/CMakeLists.txt 2026-09-17 14:40:01.103049846 +0800 -@@ -1453,7 +1453,7 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -946,6 +946,7 @@ + # + # Create the libraries. + # ++include(GNUInstallDirs) + include(AddEventLibrary) + add_event_library(event_core SOURCES ${SRC_CORE}) + add_event_library(event_extra +@@ -1453,7 +1454,7 @@ # set(EVENT_INSTALL_CMAKE_DIR - "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent") -+ "${CMAKE_INSTALL_PREFIX}/lib64/cmake/libevent") ++ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libevent") export(PACKAGE libevent)