commit: 85035e3ff63b4153763fc5f4b234a04f979e025a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Mar 21 00:49:50 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Mar 21 00:51:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85035e3f
dev-libs/check: Fix pkgconfig file's libdir Closes: https://bugs.gentoo.org/729642 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...{check-0.15.2.ebuild => check-0.15.2-r1.ebuild} | 16 ++++++------ ...-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch | 30 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild similarity index 84% rename from dev-libs/check/check-0.15.2.ebuild rename to dev-libs/check/check-0.15.2-r1.ebuild index 884e1dffe11..cdad4dc1aee 100644 --- a/dev-libs/check/check-0.15.2.ebuild +++ b/dev-libs/check/check-0.15.2-r1.ebuild @@ -25,14 +25,14 @@ DEPEND="${RDEPEND} sys-apps/texinfo" BDEPEND="doc? ( app-doc/doxygen )" -PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" ) - -src_prepare() { - cmake_src_prepare - - # Fix wrong libdir, probably caused by multilib - sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed." -} +PATCHES=( + "${FILESDIR}"/check-0.14.0-r2-disable-automagic-dep.patch + "${FILESDIR}"/${P}-Fix-pkgconfig-file-s-libdir-value.patch +) + +#src_prepare() { +# cmake_src_prepare +#} multilib_src_configure() { local mycmakeargs=( diff --git a/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch new file mode 100644 index 00000000000..195fcfb7759 --- /dev/null +++ b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch @@ -0,0 +1,30 @@ +From a6de6b02e6f8b971149c477eeca04de7d0fa5d3c Mon Sep 17 00:00:00 2001 +From: Matt Turner <matts...@gmail.com> +Date: Wed, 10 Mar 2021 17:00:33 -0500 +Subject: [PATCH] Fix pkgconfig file's libdir value + +And make a similar fix for includedir while we're here. + +Bug: https://bugs.gentoo.org/729642 +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23311d8..9d3ac07 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -439,8 +439,8 @@ if(NOT THIS_IS_SUBPROJECT) + set(prefix_save "${PREFIX}") + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +- set(libdir "\${exec_prefix}/lib") +- set(includedir "\${prefix}/include") ++ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) ++ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) + set(VERSION "${PROJECT_VERSION}") + + if (HAVE_SUBUNIT) +-- +2.26.2 +
