diff options
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 | ||||
| -rw-r--r-- | eclass/cmake.eclass | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index b08c969707ec..8127a66c2b52 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 3da3b9aeb555..f43d5af0f7ab 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 |