guofang/source-stack
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parameterize the rocky9 libevent install patch by CMAKE_INSTALL_LIBDIR

Browse Source 
Share the debian13 patch content, renamed to libevent-libdir-install.patch,
so the install directory follows CMAKE_INSTALL_LIBDIR instead of a
hardcoded lib64. On Rocky Linux GNUInstallDirs already defaults it to
lib64, so the Dockerfile does not need to pass it.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
GuofangandClaude Sonnet 5.5 committed 2026-10-27 08:58:00 +08:00
1 parent b21f7db67b
commit 195a389f8a
2 files changed
+25 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

rocky9/Dockerfile
+3 -3
View File
@@ -78,11 +78,11 @@ RUN --mount=type=bind,from=sources,source=openssl-openssl-3.0.15.tar.gz,target=/
&& cd .. \ && cd .. \
&& rm -rf src && 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 \ RUN --mount=type=bind,from=sources,source=libevent-release-2.1.12-stable.tar.gz,target=/tmp/libevent.tar.gz \
mkdir src \ mkdir src \
&& tar --extract --gzip --file=/tmp/libevent.tar.gz --directory=src --strip-components=1 \ && 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 \ && cmake -G Ninja -S src -B build -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DEVENT__DISABLE_BENCHMARK=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__DISABLE_TESTS=ON \
-DEVENT__LIBRARY_TYPE=STATIC \ -DEVENT__LIBRARY_TYPE=STATIC \
&& cmake --build build --parallel "$(nproc)" --target install \ && 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 \ RUN --mount=type=bind,from=sources,source=zstd-v1.5.7.tar.gz,target=/tmp/zstd.tar.gz \
mkdir src \ mkdir src \
rocky9/libevent-lib64-install.patch → rocky9/libevent-libdir-install.patch
+22 -16
View File
@@ -1,12 +1,11 @@
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake --- a/cmake/AddEventLibrary.cmake
--- a/cmake/AddEventLibrary.cmake 2026-09-17 14:40:01.091049579 +0800 +++ b/cmake/AddEventLibrary.cmake
+++ b/cmake/AddEventLibrary.cmake 2026-09-17 14:40:01.103049846 +0800
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY) configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY)
install( install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc" FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_NAME}.pc"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" - DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig" + DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig"
) )
endmacro() endmacro()
@@ -17,9 +16,9 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
- LIBRARY DESTINATION "lib" COMPONENT lib - LIBRARY DESTINATION "lib" COMPONENT lib
- ARCHIVE DESTINATION "lib" COMPONENT lib - ARCHIVE DESTINATION "lib" COMPONENT lib
- RUNTIME DESTINATION "lib" COMPONENT lib - RUNTIME DESTINATION "lib" COMPONENT lib
+ LIBRARY DESTINATION "lib64" COMPONENT lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
+ ARCHIVE DESTINATION "lib64" COMPONENT lib + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
+ RUNTIME DESTINATION "lib64" COMPONENT lib + RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
COMPONENT dev COMPONENT dev
) )
else() else()
@@ -30,9 +29,9 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
- LIBRARY DESTINATION "lib" COMPONENT lib - LIBRARY DESTINATION "lib" COMPONENT lib
- ARCHIVE DESTINATION "lib" COMPONENT lib - ARCHIVE DESTINATION "lib" COMPONENT lib
- RUNTIME DESTINATION "lib" COMPONENT lib - RUNTIME DESTINATION "lib" COMPONENT lib
+ LIBRARY DESTINATION "lib64" COMPONENT lib + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
+ ARCHIVE DESTINATION "lib64" COMPONENT lib + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
+ RUNTIME DESTINATION "lib64" COMPONENT lib + RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
COMPONENT dev COMPONENT dev
) )
endif() endif()
@@ -41,19 +40,26 @@ diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
install(FILES install(FILES
"$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}" "$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}"
- DESTINATION "lib" - DESTINATION "lib"
+ DESTINATION "lib64" + DESTINATION "${CMAKE_INSTALL_LIBDIR}"
COMPONENT lib) COMPONENT lib)
endif() endif()
endif() endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt
--- a/CMakeLists.txt 2026-09-17 14:40:01.091049579 +0800 +++ b/CMakeLists.txt
+++ b/CMakeLists.txt 2026-09-17 14:40:01.103049846 +0800 @@ -946,6 +946,7 @@
@@ -1453,7 +1453,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 set(EVENT_INSTALL_CMAKE_DIR
- "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent") - "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent")
+ "${CMAKE_INSTALL_PREFIX}/lib64/cmake/libevent") + "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libevent")
export(PACKAGE libevent) export(PACKAGE libevent)