* [PR PATCH] CPU-X: disable tests, don't break base-chroot
@ 2022-10-01 10:52 paper42
2022-10-01 17:09 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-10-01 10:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1281 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages CPU-X-no-grep
https://github.com/void-linux/void-packages/pull/39578
CPU-X: disable tests, don't break base-chroot
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
related to #39577
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39578.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CPU-X-no-grep-39578.patch --]
[-- Type: text/x-diff, Size: 1624 bytes --]
From 66ef1714b46224354895fdbff10d536211d30cff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Oct 2022 12:50:36 +0200
Subject: [PATCH] CPU-X: disable tests, don't break base-chroot
---
srcpkgs/CPU-X/template | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 36246fc521f9..2b0ff13ff4b4 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -8,7 +8,6 @@ hostmakedepends="pkg-config nasm"
makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
$(vopt_if gtk3 gtk+3-devel)"
-checkdepends="mawk nawk grep"
short_desc="Free software that gathers information on CPU, motherboard and more"
maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-3.0-or-later"
@@ -18,15 +17,11 @@ distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
build_options="gtk3"
build_options_default="gtk3"
+# needs grep -P which is not available in chroot-grep and replacing it with
+# grep breaks base-chroot
+make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
LDFLAGS="-lexecinfo"
fi
-
-# Tests depend on the -P flag of grep, which is not available in chroot-grep
-# and installing grep as checkdepends breaks base-chroot.
-# So, only run tests in CI, where the masterdir is ephemeral anyway.
-if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
- make_check=no # breaks base-chroot
-fi
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: CPU-X: disable tests, don't break base-chroot
2022-10-01 10:52 [PR PATCH] CPU-X: disable tests, don't break base-chroot paper42
@ 2022-10-01 17:09 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-10-01 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]
There's a merged pull request on the void-packages repository
CPU-X: disable tests, don't break base-chroot
https://github.com/void-linux/void-packages/pull/39578
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
related to #39577
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-01 17:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-01 10:52 [PR PATCH] CPU-X: disable tests, don't break base-chroot paper42
2022-10-01 17:09 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).