* [PR PATCH] shutils/build_dependencies.sh: print "with" before build style/helper names
@ 2023-04-07 12:01 0x5c
2023-04-13 3:49 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: 0x5c @ 2023-04-07 12:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]
There is a new pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages fix/build-with-style
https://github.com/void-linux/void-packages/pull/43320
shutils/build_dependencies.sh: print "with" before build style/helper names
Messages like "building [rust] for <platform>" could lead to mild panic as they might be read as "building <large toolchain> on your laptop".
Simply adding "with" before the style/helpers should solve that.
It works for build_style, build_helper, both, and none.
```
=> ircdog-0.4.0_2: building with [go] for x86_64...
=> firefox-111.0.1_1: building with [rust] for x86_64...
=> riff-2.23.2_1: building with [cargo] [rust] for x86_64...
=> discord-0.0.26_1: building for x86_64...
```
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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/43320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/build-with-style-43320.patch --]
[-- Type: text/x-diff, Size: 1455 bytes --]
From d9f67d4f9158dd8fc79bd80c40667c5a176c7906 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 7 Apr 2023 07:40:04 -0400
Subject: [PATCH] shutils/build_dependencies.sh: print "with" before build
style/helper names
Messages like "building [rust] for <platform>" could lead to mild panic as they
might be read as "building <large toolchain> on your laptop".
Simply adding "with" before the style/helpers should solve that.
It works for build_style, build_helper, both, and none.
=> ircdog-0.4.0_2: building with [go] for x86_64...
=> firefox-111.0.1_1: building with [rust] for x86_64...
=> riff-2.23.2_1: building with [cargo] [rust] for x86_64...
=> discord-0.0.26_1: building for x86_64...
---
common/xbps-src/shutils/build_dependencies.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 1d19de54ae80..20f61528d14c 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -138,7 +138,12 @@ install_pkg_deps() {
[ -z "$pkgname" ] && return 2
[ -z "$XBPS_CHECK_PKGS" ] && unset checkdepends
- [[ $build_style ]] && style=" [$build_style]"
+
+ if [[ $build_style ]] || [[ $build_helper ]]; then
+ style=" with"
+ fi
+
+ [[ $build_style ]] && style+=" [$build_style]"
for s in $build_helper; do
style+=" [$s]"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: shutils/build_dependencies.sh: print "with" before build style/helper names
2023-04-07 12:01 [PR PATCH] shutils/build_dependencies.sh: print "with" before build style/helper names 0x5c
@ 2023-04-13 3:49 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2023-04-13 3:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1638 bytes --]
There's a merged pull request on the void-packages repository
shutils/build_dependencies.sh: print "with" before build style/helper names
https://github.com/void-linux/void-packages/pull/43320
Description:
Messages like "building [rust] for <platform>" could lead to mild panic as they might be read as "building [large toolchain] on your laptop".
Simply adding "with" before the style/helpers should solve that.
It works for build_style, build_helper, both, and none.
```
=> ircdog-0.4.0_2: building with [go] for x86_64...
=> firefox-111.0.1_1: building with [rust] for x86_64...
=> riff-2.23.2_1: building with [cargo] [rust] for x86_64...
=> discord-0.0.26_1: building for x86_64...
```
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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:[~2023-04-13 3:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07 12:01 [PR PATCH] shutils/build_dependencies.sh: print "with" before build style/helper names 0x5c
2023-04-13 3:49 ` [PR PATCH] [Merged]: " classabbyamp
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).