From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9499B15ACFB for ; Mon, 24 Apr 2023 21:22:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC413E086B; Mon, 24 Apr 2023 21:22:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADA26E086B for ; Mon, 24 Apr 2023 21:22:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BB35340E85 for ; Mon, 24 Apr 2023 21:22:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3BF7920 for ; Mon, 24 Apr 2023 21:22:53 +0000 (UTC) From: "Henri Gasc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Henri Gasc" Message-ID: <1682371369.c858e783d282e2b770996c2569ffaad1f5ca5556.gasc@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/imhex/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/imhex/imhex-1.28.0.ebuild X-VCS-Directories: app-editors/imhex/ X-VCS-Committer: gasc X-VCS-Committer-Name: Henri Gasc X-VCS-Revision: c858e783d282e2b770996c2569ffaad1f5ca5556 X-VCS-Branch: dev Date: Mon, 24 Apr 2023 21:22:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6a0f1c25-e391-464a-a8c0-2b557cae9e88 X-Archives-Hash: b8314d251d19ea04c85db296b8c3581b commit: c858e783d282e2b770996c2569ffaad1f5ca5556 Author: Henri Gasc eurecom fr> AuthorDate: Mon Apr 24 21:21:54 2023 +0000 Commit: Henri Gasc eurecom fr> CommitDate: Mon Apr 24 21:22:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c858e783 app-editors/imhex: use CFLAGS and CXXFLAGS, disable testing Closes: https://bugs.gentoo.org/904953 Closes: https://bugs.gentoo.org/904954 Signed-off-by: Henri Gasc eurecom.fr> app-editors/imhex/imhex-1.28.0.ebuild | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/app-editors/imhex/imhex-1.28.0.ebuild b/app-editors/imhex/imhex-1.28.0.ebuild index 8f91766d1..be29cd82b 100644 --- a/app-editors/imhex/imhex-1.28.0.ebuild +++ b/app-editors/imhex/imhex-1.28.0.ebuild @@ -55,12 +55,14 @@ pkg_pretend() { src_prepare() { default - # Due to network sandboxing, we can't do network test here. + # We are removing all tests altogether + # The tests need ImHex installed to succeed (see https://bugs.gentoo.org/attachment.cgi?id=860683), so we remove them + # We could use `ln "${BUILD_DIR}/lib/libimhex.so.${PV}" "/lib64/libimhex.so.${PV}"` and circumvent sandboxing sed -i \ - -e 's/StoreAPI$/#StoreAPI/' \ - -e 's/TipsAPI$/#TipsAPI/' \ - -e 's/ContentAPI$/#ContentAPI/' \ - "${S}/tests/helpers/CMakeLists.txt" || die + -e 's/enable_testing/#enable_testing/' \ + -e 's/add_subdirectory(tests/#add_subdirectory(tests/' \ + "${S}/CMakeLists.txt" || die + cmake_src_prepare } @@ -69,8 +71,8 @@ src_configure() { -D CMAKE_BUILD_TYPE="Release" \ -D CMAKE_C_COMPILER_LAUNCHER=ccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -D CMAKE_C_FLAGS="-fuse-ld=lld" \ - -D CMAKE_CXX_FLAGS="-fuse-ld=lld" \ + -D CMAKE_C_FLAGS="-fuse-ld=lld ${CFLAGS}" \ + -D CMAKE_CXX_FLAGS="-fuse-ld=lld ${CXXFLAGS}" \ -D CMAKE_OBJC_COMPILER_LAUNCHER=ccache \ -D CMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \ -D CMAKE_SKIP_RPATH=ON \ @@ -97,13 +99,6 @@ src_configure() { cmake_src_configure } -src_test() { - pushd "${BUILD_DIR}" || die - emake unit_tests - popd || die - cmake_src_test -} - src_install() { cmake_src_install