From 85035e3ff63b4153763fc5f4b234a04f979e025a Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 20 Mar 2021 20:49:50 -0400 Subject: dev-libs/check: Fix pkgconfig file's libdir Closes: https://bugs.gentoo.org/729642 Signed-off-by: Matt Turner --- dev-libs/check/check-0.15.2-r1.ebuild | 60 ++++++++++++++++++++++ dev-libs/check/check-0.15.2.ebuild | 60 ---------------------- ...-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch | 30 +++++++++++ 3 files changed, 90 insertions(+), 60 deletions(-) create mode 100644 dev-libs/check/check-0.15.2-r1.ebuild delete mode 100644 dev-libs/check/check-0.15.2.ebuild create mode 100644 dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch (limited to 'dev-libs/check') diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild new file mode 100644 index 000000000000..cdad4dc1aee8 --- /dev/null +++ b/dev-libs/check/check-0.15.2-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib + +DESCRIPTION="A unit test framework for C" +HOMEPAGE="https://libcheck.github.io/check/" +SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc subunit test" + +# Tests seem to timeout on ppc* systems, #736661 +RESTRICT="ppc? ( test ) + ppc64? ( test ) + !test? ( test )" + +RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + sys-apps/texinfo" +BDEPEND="doc? ( app-doc/doxygen )" + +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=( + -DBUILD_TESTING=$(usex test ON OFF) + -DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF) + ) + + cmake_src_configure +} + +multilib_src_compile() { + cmake_src_compile + + if use doc && multilib_is_native_abi; then + cd "${S}"/doc/ || die "Failed to switch directories." + doxygen "." || die "Failed to run doxygen to generate docs." + fi +} + +multilib_src_install_all() { + use doc && local HTML_DOCS=( "${S}"/doc/html/. ) + einstalldocs + + find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die +} diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild deleted file mode 100644 index 884e1dffe112..000000000000 --- a/dev-libs/check/check-0.15.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="A unit test framework for C" -HOMEPAGE="https://libcheck.github.io/check/" -SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc subunit test" - -# Tests seem to timeout on ppc* systems, #736661 -RESTRICT="ppc? ( test ) - ppc64? ( test ) - !test? ( test )" - -RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )" -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." -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF) - ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - - if use doc && multilib_is_native_abi; then - cd "${S}"/doc/ || die "Failed to switch directories." - doxygen "." || die "Failed to run doxygen to generate docs." - fi -} - -multilib_src_install_all() { - use doc && local HTML_DOCS=( "${S}"/doc/html/. ) - einstalldocs - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} 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 000000000000..195fcfb77599 --- /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 +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 + -- cgit v1.2.3-65-gdbad