[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: ba7438a633bd36de2923db9f48d66b8b452817ee
Author: Sam James gentoo org>
AuthorDate: Tue Jun 1 11:32:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 11:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7438a6
dev-libs/criterion: add GCC 11 patch
Closes: https://bugs.gentoo.org/791706
Signed-off-by: Sam James gentoo.org>
dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 4
.../criterion/files/criterion-2.4_pre20200110-gcc11.patch| 12
2 files changed, 16 insertions(+)
diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
index e4a1dfa78f3..54b81b96c9d 100644
--- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
+++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild
@@ -37,6 +37,10 @@ BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
+)
+
python_check_deps() {
has_version "dev-util/cram[${PYTHON_USEDEP}]"
}
diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
new file mode 100644
index 000..c99e03af6f1
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/include/criterion/internal/assert/ieee.h
b/include/criterion/internal/assert/ieee.h
+index 3b6de3b..2063d87 100644
+--- a/include/criterion/internal/assert/ieee.h
b/include/criterion/internal/assert/ieee.h
+@@ -29,6 +29,7 @@
+ #ifdef __cplusplus
+
+ # include
++# include
+
+ namespace criterion { namespace internal { namespace operators {
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: dfd6cd5bbfc1b699cb35bdb40b028c3389c81252
Author: Michał Górny gentoo org>
AuthorDate: Mon May 31 20:21:12 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Mon May 31 20:21:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd6cd5b
dev-libs/criterion: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-libs/criterion/Manifest | 1 -
dev-libs/criterion/criterion-2.3.3.ebuild | 55 -
dev-libs/criterion/files/criterion-libdir.patch | 30 --
3 files changed, 86 deletions(-)
diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
index 68937b71692..514c207130c 100644
--- a/dev-libs/criterion/Manifest
+++ b/dev-libs/criterion/Manifest
@@ -1,5 +1,4 @@
DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B
c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f
SHA512
58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
-DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B
7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18
SHA512
bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16
DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B
78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769
SHA512
f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B
7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544
SHA512
fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B
5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb
SHA512
14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild
b/dev-libs/criterion/criterion-2.3.3.ebuild
deleted file mode 100644
index 808455b3876..000
--- a/dev-libs/criterion/criterion-2.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake python-any-r1
-
-DESCRIPTION="Cross platform unit testing framework for C and C++"
-HOMEPAGE="https://github.com/Snaipe/Criterion;
-SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/nanomsg:="
-DEPEND="${RDEPEND}
- test? (
- $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
- )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${PN}-libdir.patch"
-S="${WORKDIR}/${PN}-v${PV}"
-
-QA_EXECSTACK="usr/lib*/libcriterion.so*"
-
-python_check_deps() {
- has_version "dev-util/cram[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCTESTS="$(usex test ON OFF)"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use test; then
- cmake_build criterion_tests
- fi
-}
diff --git a/dev-libs/criterion/files/criterion-libdir.patch
b/dev-libs/criterion/files/criterion-libdir.patch
deleted file mode 100644
index 91b28b06b94..000
--- a/dev-libs/criterion/files/criterion-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/.cmake/Modules/PackageUtils.cmake
b/.cmake/Modules/PackageUtils.cmake
-index 593f2d1..a771fd5 100644
a/.cmake/Modules/PackageUtils.cmake
-+++ b/.cmake/Modules/PackageUtils.cmake
-@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
- endforeach ()
-
- install(TARGETS ${_LIB}
--RUNTIME DESTINATION bin
--LIBRARY DESTINATION lib
--ARCHIVE DESTINATION lib ${install_flags}
-+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
- )
- endfunction ()
-
-diff --git a/src/criterion.pc.in b/src/criterion.pc.in
-index 18ac3d6..23737a4 100644
a/src/criterion.pc.in
-+++ b/src/criterion.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: a9995983c28c1bb484ff695ed74c2a543b0f4299
Author: Tomáš Mózes gmail com>
AuthorDate: Sun Jan 5 03:38:45 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Jan 5 20:18:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9995983
dev-libs/criterion: improve ebuild
Signed-off-by: Tomáš Mózes gmail.com>
Closes: https://bugs.gentoo.org/703530
Closes: https://github.com/gentoo/gentoo/pull/14093
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/criterion/criterion-2.3.3.ebuild | 31 +
dev-libs/criterion/files/criterion-libdir.patch | 30
2 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild
b/dev-libs/criterion/criterion-2.3.3.ebuild
index e0b34016c62..1f2eda350a6 100644
--- a/dev-libs/criterion/criterion-2.3.3.ebuild
+++ b/dev-libs/criterion/criterion-2.3.3.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake
+inherit cmake python-any-r1
DESCRIPTION="Cross platform unit testing framework for C and C++"
HOMEPAGE="https://github.com/Snaipe/Criterion;
@@ -18,13 +20,24 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-libs/nanomsg:="
DEPEND="${RDEPEND}
- test? ( dev-util/cram )"
+ test? (
+ $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
+ )"
BDEPEND="virtual/pkgconfig"
+PATCHES="${FILESDIR}/${PN}-libdir.patch"
S="${WORKDIR}/${PN}-v${PV}"
QA_EXECSTACK="usr/lib*/libcriterion.so*"
+python_check_deps() {
+ has_version "dev-util/cram[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
-DCTESTS="$(usex test ON OFF)"
@@ -40,15 +53,3 @@ src_compile() {
cmake_build criterion_tests
fi
}
-
-src_install() {
- cmake_src_install
-
- if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then
- mkdir -p "${D}/usr/$(get_libdir)" || die
- mv "${D}"/usr/lib/libcriterion.so* "${D}/usr/$(get_libdir)/" ||
die
- fi
-
- sed -i "s@${prefix}/lib@${prefix}/$(get_libdir)@g" \
- "${D}/usr/share/pkgconfig/criterion.pc" || die
-}
diff --git a/dev-libs/criterion/files/criterion-libdir.patch
b/dev-libs/criterion/files/criterion-libdir.patch
new file mode 100644
index 000..91b28b06b94
--- /dev/null
+++ b/dev-libs/criterion/files/criterion-libdir.patch
@@ -0,0 +1,30 @@
+diff --git a/.cmake/Modules/PackageUtils.cmake
b/.cmake/Modules/PackageUtils.cmake
+index 593f2d1..a771fd5 100644
+--- a/.cmake/Modules/PackageUtils.cmake
b/.cmake/Modules/PackageUtils.cmake
+@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
+ endforeach ()
+
+ install(TARGETS ${_LIB}
+-RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib ${install_flags}
++RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
+ )
+ endfunction ()
+
+diff --git a/src/criterion.pc.in b/src/criterion.pc.in
+index 18ac3d6..23737a4 100644
+--- a/src/criterion.pc.in
b/src/criterion.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include
+-libdir=${prefix}/lib
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+
+ Name: @PROJECT_NAME@
+ Description: A KISS, Cross platform unit testing framework for C and C++
