commit: 89d746829c14ffb7ea1cc2de97bab63d0b77fdb5 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Jul 24 21:24:36 2020 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Jul 24 21:25:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d74682
cmake*.eclass: Hardcode CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX for riscv Bug: https://bugs.gentoo.org/689410 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> eclass/cmake-utils.eclass | 6 ++++++ eclass/cmake.eclass | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index b08c969707e..8127a66c2b5 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -657,6 +657,12 @@ cmake-utils_src_configure() { SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "") SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules") _EOF_ + + # See bug 689410 + if [[ "${ARCH}" == riscv ]]; then + echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die + fi + [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" if [[ ${EAPI} != [56] ]]; then diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 3da3b9aeb55..f43d5af0f7a 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -471,6 +471,12 @@ cmake_src_configure() { SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") SET (BUILD_SHARED_LIBS ON CACHE BOOL "") _EOF_ + + # See bug 689410 + if [[ "${ARCH}" == riscv ]]; then + echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die + fi + if [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]]; then echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die fi
