From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52441138359 for ; Fri, 24 Jul 2020 21:29:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87B80E0863; Fri, 24 Jul 2020 21:29:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FE81E0863 for ; Fri, 24 Jul 2020 21:29:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52EFE34EF71 for ; Fri, 24 Jul 2020 21:29:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF5F029A for ; Fri, 24 Jul 2020 21:29:36 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1595626144.7318b8b9cfc9d2a172e75701ea95f63f7cffa0f5.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 7318b8b9cfc9d2a172e75701ea95f63f7cffa0f5 X-VCS-Branch: master Date: Fri, 24 Jul 2020 21:29:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9a670554-b975-40ff-84c4-0a72ee25e59b X-Archives-Hash: 75aff1bef7ecbdf9108ed5dde8ad63c9 commit: 7318b8b9cfc9d2a172e75701ea95f63f7cffa0f5 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Jul 24 21:24:36 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Jul 24 21:29:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7318b8b9 cmake*.eclass: Hardcode CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX for riscv Bug: https://bugs.gentoo.org/689410 Signed-off-by: Andreas K. Hüttel gentoo.org> eclass/cmake.eclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index f1e013cd24..9f47538018 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