[gentoo-commits] repo/gentoo:master commit in: dev-libs/check/files/, dev-libs/check/
commit: 85035e3ff63b4153763fc5f4b234a04f979e025a
Author: Matt Turner gentoo org>
AuthorDate: Sun Mar 21 00:49:50 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Mar 21 00:51:57 2021 +
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 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 000..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
+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
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/check/files/, dev-libs/check/
commit: 06d2b112fde3faca9767a93835c07009ada5b177
Author: Joonas Niilola gentoo org>
AuthorDate: Mon Mar 23 13:12:07 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Mar 23 13:13:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06d2b112
dev-libs/check: update subunit logic, fix pkgconfig file
- subunit & doc handling patches from #711390
- .pc libdir issue when using multilib #714058
Bug: https://bugs.gentoo.org/711390
Closes: https://bugs.gentoo.org/714058
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/check/check-0.14.0-r2.ebuild | 58 ++
.../check-0.14.0-r2-disable-automagic-dep.patch| 23 +
2 files changed, 81 insertions(+)
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild
b/dev-libs/check/check-0.14.0-r2.ebuild
new file mode 100644
index 000..c2a9889d2e5
--- /dev/null
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 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/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc subunit test"
+
+RESTRICT="!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.14.0-r2-disable-automagic-dep.patch
b/dev-libs/check/files/check-0.14.0-r2-disable-automagic-dep.patch
new file mode 100644
index 000..0843413ee2e
--- /dev/null
+++ b/dev-libs/check/files/check-0.14.0-r2-disable-automagic-dep.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt 2020-03-21 09:42:30.411037664 +0200
b/CMakeLists.txt 2020-03-21 09:49:12.358161439 +0200
+@@ -365,15 +365,16 @@
+ ADD_DEFINITIONS(-DHAVE_LIBRT=1)
+ endif (HAVE_LIBRT)
+
+-check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
+-if (HAVE_SUBUNIT)
++option(CHECK_ENABLE_SUBUNIT "Enable subunit support" ON)
++if (CHECK_ENABLE_SUBUNIT)
+ set(SUBUNIT "subunit")
+ set(ENABLE_SUBUNIT 1)
++ set(HAVE_SUBUNIT 1)
+ add_definitions(-DENABLE_SUBUNIT=1)
+-else(HAVE_SUBUNIT)
++else(CHECK_ENABLE_SUBUNIT)
+ set(ENABLE_SUBUNIT 0)
+ add_definitions(-DENABLE_SUBUNIT=0)
+-endif (HAVE_SUBUNIT)
++endif (CHECK_ENABLE_SUBUNIT)
+
+
###
+ # Generate "config.h" from "cmake/config.h.in"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/check/files/, dev-libs/check/
commit: 812ed593f07a3c6518b7ccaa4e5acc156fc07d5d
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Apr 14 08:13:35 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Apr 14 08:13:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812ed593
dev-libs/check: Fix tests (#648920 by ernsteiswuerfel)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-libs/check/check-0.12.0.ebuild | 18 +++---
dev-libs/check/files/check-0.12.0-fp.patch | 22 ++
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/dev-libs/check/check-0.12.0.ebuild
b/dev-libs/check/check-0.12.0.ebuild
index acde41e304b..25d0f16bf8a 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -15,14 +15,18 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc
~ppc64 ~s390 ~sh spa
IUSE="static-libs subunit"
RDEPEND="
- subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="
- ${RDEPEND}
+ subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
sys-apps/texinfo
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS TODO )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Fix test failures due to varying floating point behavior across
platforms
+ # (#648920), patch from Fedora.
+ "${FILESDIR}/${PN}-0.12.0-fp.patch"
+)
pkg_setup() {
# See multilib_src_test(), disable sleep()-based tests because they
diff --git a/dev-libs/check/files/check-0.12.0-fp.patch
b/dev-libs/check/files/check-0.12.0-fp.patch
new file mode 100644
index 000..7907df989a1
--- /dev/null
+++ b/dev-libs/check/files/check-0.12.0-fp.patch
@@ -0,0 +1,22 @@
+--- a/tests/check_check_master.c.orig 2018-01-29 20:33:55.033001412 -0700
b/tests/check_check_master.c 2018-01-29 20:34:31.501879454 -0700
+@@ -214,7 +214,7 @@ static master_test_t master_tests[] = {
+ { "Simple Tests", "test_ck_assert_ldouble_ge", CK_FAILURE, CK_MSG_TEXT,
"Assertion 'x >= y' failed: x == 2.5, y == 3" },
+ { "Simple Tests", "test_ck_assert_ldouble_ge_with_mod", CK_FAILURE,
CK_MSG_TEXT, "Assertion '2%d >= 3%f' failed: 2%d == 0, 3%f == 1" },
+ { "Simple Tests", "test_ck_assert_ldouble_with_expr", CK_PASS, CK_MSG_TEXT,
"Passed" },
+- { "Simple Tests", "test_ck_assert_ldouble_eq_tol", CK_FAILURE, CK_MSG_TEXT,
"Assertion 'fabsl(y - x) < t' failed: x == 0.001, y == 0.002, t == 0.001" },
++ { "Simple Tests", "test_ck_assert_ldouble_eq_tol", CK_FAILURE, CK_MSG_TEXT,
"Assertion 'fabsl(y - x) < t' failed: x == 0.001, y == 0.002, t == 0.0009" },
+ { "Simple Tests", "test_ck_assert_ldouble_eq_tol_with_mod", CK_FAILURE,
CK_MSG_TEXT, "Assertion 'fabsl(2%f - 3%d) < 2%p' failed: 3%d == 1, 2%f == 0,
2%p == 0" },
+ { "Simple Tests", "test_ck_assert_ldouble_ne_tol", CK_FAILURE, CK_MSG_TEXT,
"Assertion 'fabsl(y - x) >= t' failed: x == 0.001, y == 0.002, t == 0.01" },
+ { "Simple Tests", "test_ck_assert_ldouble_ne_tol_with_mod", CK_FAILURE,
CK_MSG_TEXT, "Assertion 'fabsl(3%f - 3%d) >= 3%p' failed: 3%d == 1, 3%f == 1,
3%p == 1" },
+--- a/tests/check_check_sub.c.orig 2017-10-20 06:44:10.0 -0600
b/tests/check_check_sub.c 2018-01-29 20:33:55.034001409 -0700
+@@ -1812,7 +1812,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol
+ y*=10.0l;
+ t*=10.0l;
+ ck_assert_ldouble_eq_tol(x, y, t);
+- t/=10.0l;
++ t=0.0009l;
+ record_failure_line_num(__LINE__);
+ ck_assert_ldouble_eq_tol(x, y, t);
+ }
