commit: 6188c37bf1ac4e086bdda4e5fbbe7c891788d331 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Nov 2 09:19:08 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sat Nov 2 09:19:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6188c37b
sys-libs/cyclonedds: fix tests and RDEPEND Closes: https://bugs.gentoo.org/921847 Closes: https://bugs.gentoo.org/933210 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> ...edds-0.10.3.ebuild => cyclonedds-0.10.3-r1.ebuild} | 19 ++++++++++++------- sys-libs/cyclonedds/cyclonedds-9999.ebuild | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild similarity index 78% rename from sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild rename to sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild index b1e0bed51..4e05f3e6f 100644 --- a/sys-libs/cyclonedds/cyclonedds-0.10.3.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-0.10.3-r1.ebuild @@ -21,18 +21,23 @@ SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" RESTRICT="!test? ( test )" -RDEPEND=( - "doc? ( app-text/doxygen )" - "ssl? ( dev-libs/openssl )" - "shm? ( sys-libs/iceoryx )" - "parser? ( sys-devel/bison )" -) -DEPEND="${RDEPEND[@]}" +RDEPEND=" + doc? ( app-text/doxygen ) + ssl? ( dev-libs/openssl:= ) + shm? ( sys-libs/iceoryx:= ) + parser? ( sys-devel/bison ) +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-util/cunit )" CMAKE_BUILD_TYPE=Release src_prepare() { use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch" + + # disable tests that requires FEATURES=-network-sandbox + sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die + cmake_src_prepare } diff --git a/sys-libs/cyclonedds/cyclonedds-9999.ebuild b/sys-libs/cyclonedds/cyclonedds-9999.ebuild index b1e0bed51..4e05f3e6f 100644 --- a/sys-libs/cyclonedds/cyclonedds-9999.ebuild +++ b/sys-libs/cyclonedds/cyclonedds-9999.ebuild @@ -21,18 +21,23 @@ SLOT="0/$(ver_cut 1-2)" IUSE="test ssl shm parser doc examples ipv6 idlc get-kind" RESTRICT="!test? ( test )" -RDEPEND=( - "doc? ( app-text/doxygen )" - "ssl? ( dev-libs/openssl )" - "shm? ( sys-libs/iceoryx )" - "parser? ( sys-devel/bison )" -) -DEPEND="${RDEPEND[@]}" +RDEPEND=" + doc? ( app-text/doxygen ) + ssl? ( dev-libs/openssl:= ) + shm? ( sys-libs/iceoryx:= ) + parser? ( sys-devel/bison ) +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-util/cunit )" CMAKE_BUILD_TYPE=Release src_prepare() { use get-kind && eapply "${FILESDIR}/${PN}-0.10.3-get_kind.patch" + + # disable tests that requires FEATURES=-network-sandbox + sed -i '/ifaddrs.c$/d' src/ddsrt/tests/CMakeLists.txt || die + cmake_src_prepare }
