Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src: explicitly disallow pattern on build deps
@ 2022-08-08 18:22 Chocimier
  2022-08-08 18:58 ` classabbyamp
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: Chocimier @ 2022-08-08 18:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org hostmakedepends-pattern
https://github.com/void-linux/void-packages/pull/38540

xbps-src: explicitly disallow pattern on build deps
It is not possible to use version other than currently in template.

Specifying pattern breaks build if dependency isn't in binary repo
already. That it worked when in repo was a coincidence.

<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/38540.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hostmakedepends-pattern-38540.patch --]
[-- Type: text/x-diff, Size: 2251 bytes --]

From 420a8ca9137fa8e3a3cadb757d0d03b0b03e670a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 8 Aug 2022 20:11:02 +0200
Subject: [PATCH] xbps-src: explicitly disallow pattern on build deps

It is not possible to use version other than currently in template.

Specifying pattern breaks build if dependency isn't in binary repo
already. That it worked when in repo was a coincidence.
---
 common/xbps-src/shutils/build_dependencies.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index e4e2210d4e56..bc6934fbda1f 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -160,6 +160,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in host dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then
@@ -210,6 +212,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in check dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_CMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then
@@ -260,6 +264,8 @@ install_pkg_deps() {
             if [ -f $XBPS_SRCPKGDIR/$f/template ]; then
                 templates+=" $f"
                 continue
+            elif [ "${f/>/}" != "${f}" ] || [ "${f/</}" != "${f}" ]; then
+                msg_error "$pkgver: version pattern in build dependency '$f' is invalid, template version is used always\n"
             fi
             local _repourl=$($XBPS_QUERY_XCMD -R -prepository "$f" 2>/dev/null)
             if [ "$_repourl" ]; then

^ permalink raw reply	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-02-14  1:10 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-08 18:22 [PR PATCH] xbps-src: explicitly disallow pattern on build deps Chocimier
2022-08-08 18:58 ` classabbyamp
2022-08-08 20:29 ` Chocimier
2022-08-08 23:12 ` paper42
2022-08-10 15:59 ` [PR PATCH] [Updated] " Chocimier
2022-08-10 16:00 ` Chocimier
2022-08-10 16:35 ` Duncaen
2022-11-10  2:13 ` github-actions
2023-02-08  2:35 ` github-actions
2023-02-13 22:33 ` [PR PATCH] [Updated] " Chocimier
2023-02-13 22:33 ` Chocimier
2023-02-13 22:34 ` Chocimier
2023-02-13 22:41 ` Duncaen
2023-02-13 22:43 ` Chocimier
2023-02-13 22:48 ` Duncaen
2023-02-13 22:56 ` Duncaen
2023-02-14  1:09 ` [PR PATCH] [Merged]: " classabbyamp
2023-02-14  1:10 ` 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).