commit: 837259803593f16223ba81a222b8b7d160362367 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Mon Dec 11 07:03:29 2023 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Dec 11 07:42:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83725980
sci-libs/kineto: prefixify absolute paths Closes: https://bugs.gentoo.org/919678 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34230 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch | 4 ++-- sci-libs/kineto/kineto-0.4.0_p20231031.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch index 29804d93161c..d0f8790ae5a5 100644 --- a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch +++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch @@ -35,8 +35,8 @@ -set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/") -set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/") -+set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/") -+set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/") ++set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/") ++set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/") message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}") message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}") diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild index fb7e15a451db..aa8b2eea8a00 100644 --- a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -inherit python-any-r1 cmake +inherit python-any-r1 cmake prefix CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014 @@ -30,7 +30,6 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${PN}-0.4.0-gcc13.patch ) @@ -44,8 +43,9 @@ src_prepare() { src_configure() { cd libkineto local mycmakeargs=( - -DLIBKINETO_THIRDPARTY_DIR=/usr/include/ + -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ ) + eapply $(prefixify_ro "${FILESDIR}"/${P}-gentoo.patch) cmake_src_configure }
