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 F0CB81382C5 for ; Fri, 4 Jun 2021 07:38:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29002E0869; Fri, 4 Jun 2021 07:38:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 152C7E0869 for ; Fri, 4 Jun 2021 07:38:45 +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 2F5DA341084 for ; Fri, 4 Jun 2021 07:38:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFBA273A for ; Fri, 4 Jun 2021 07:38:42 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1622792316.947d701c21889771f1f6839f2b46d96789fcee59.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/opencascade/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/opencascade/opencascade-7.5.1-r1.ebuild sci-libs/opencascade/opencascade-7.5.1.ebuild X-VCS-Directories: sci-libs/opencascade/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 947d701c21889771f1f6839f2b46d96789fcee59 X-VCS-Branch: master Date: Fri, 4 Jun 2021 07:38:42 +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: baf5a277-68ca-4f65-b4ed-2efb0f462a19 X-Archives-Hash: 4a42b4f63d32a859059250ce9a33bf13 commit: 947d701c21889771f1f6839f2b46d96789fcee59 Author: Wolfgang E. Sanyer gmail com> AuthorDate: Mon May 17 19:36:44 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jun 4 07:38:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947d701c sci-libs/opencascade: patch cmake config so that find_package works Signed-off-by: Wolfgang E. Sanyer gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20856 Signed-off-by: Joonas Niilola gentoo.org> .../{opencascade-7.5.1.ebuild => opencascade-7.5.1-r1.ebuild} | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sci-libs/opencascade/opencascade-7.5.1.ebuild b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild similarity index 92% rename from sci-libs/opencascade/opencascade-7.5.1.ebuild rename to sci-libs/opencascade/opencascade-7.5.1-r1.ebuild index 474b381f556..88f0fd45888 100644 --- a/sci-libs/opencascade/opencascade-7.5.1.ebuild +++ b/sci-libs/opencascade/opencascade-7.5.1-r1.ebuild @@ -80,6 +80,13 @@ src_prepare() { sed -e 's/\/lib\$/\/'$(get_libdir)'\$/' \ -i adm/templates/OpenCASCADEConfig.cmake.in || die + + # There is an OCCT_UPDATE_TARGET_FILE cmake macro that fails due to some + # assumptions it makes about installation paths. Rather than fixing it, just + # get rid of the mechanism altogether - its purpose is to allow a + # side-by-side installation of release and debug libraries. + sed -e 's|\\${OCCT_INSTALL_BIN_LETTER}||' \ + -i "adm/cmake/occt_toolkit.cmake" } src_configure() {