GuofangandClaude Sonnet 5
ef0079c3ee
Verified every third-party build step by building and inspecting the resulting image, and fixed each one that landed in /usr/local/lib instead of /usr/local/lib64: CMake projects got -DLIB_INSTALL_DIR, -DCMAKE_INSTALL_LIBDIR, -DLIBRARY_INSTALL_DIR or -DLIB_SUFFIX as appropriate, autotools projects got --libdir=/usr/local/lib64, and libevent (which hardcodes lib with no override) is now patched via libevent-lib64-install.patch before building. Also drops the boost/ libaio/util-linux/gmp/nettle/gnutls/libproxyprotocol checksum checks, removes the now-unused lib->lib64 copy fallback, and switches libxml2 to the wangguofang.net GitHub mirror since gitlab.gnome.org is unreachable from the build environment. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QUU2cEU5XgLpfGVN8Jpa7d
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
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
|
|
@@ -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"
|
|
)
|
|
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 "lib64" COMPONENT lib
|
|
+ ARCHIVE DESTINATION "lib64" COMPONENT lib
|
|
+ RUNTIME DESTINATION "lib64" 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 "lib64" COMPONENT lib
|
|
+ ARCHIVE DESTINATION "lib64" COMPONENT lib
|
|
+ RUNTIME DESTINATION "lib64" COMPONENT lib
|
|
COMPONENT dev
|
|
)
|
|
endif()
|
|
@@ -181,7 +181,7 @@
|
|
if (NOT WIN32)
|
|
install(FILES
|
|
"$<TARGET_FILE_DIR:${LIB_NAME}_shared>/${LIB_LINK_NAME}"
|
|
- DESTINATION "lib"
|
|
+ DESTINATION "lib64"
|
|
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 @@
|
|
#
|
|
|
|
set(EVENT_INSTALL_CMAKE_DIR
|
|
- "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent")
|
|
+ "${CMAKE_INSTALL_PREFIX}/lib64/cmake/libevent")
|
|
|
|
export(PACKAGE libevent)
|
|
|