Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src: Clear subpkg data before printing subpkg
@ 2021-01-27 17:52 Vaelatern
  2021-01-27 17:54 ` [PR REVIEW] " ericonr
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Vaelatern @ 2021-01-27 17:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Vaelatern/void-packages xbps-src-show-stuff
https://github.com/void-linux/void-packages/pull/28268

xbps-src: Clear subpkg data before printing subpkg
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28268.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-show-stuff-28268.patch --]
[-- Type: text/x-diff, Size: 1034 bytes --]

From a5a7c94046ad4f51a565054f303ca0abb6d17579 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 12:49:14 -0500
Subject: [PATCH] xbps-src: Clear subpkg data before printing subpkg

---
 srcpkgs/rust/template | 1 -
 xbps-src              | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4d25635d409..6bb928e1478 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,7 +354,6 @@ rust-doc_package() {
 
 rust-std_package() {
 	short_desc+=" - standard library"
-	depends=""
 	pkg_install() {
 		vmove usr/lib/rustlib
 	}
diff --git a/xbps-src b/xbps-src
index fa677084ce0..ead0670e9cb 100755
--- a/xbps-src
+++ b/xbps-src
@@ -859,6 +859,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+		. common/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR REVIEW] xbps-src: Clear subpkg data before printing subpkg
  2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
@ 2021-01-27 17:54 ` ericonr
  2021-01-27 17:54 ` ericonr
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-01-27 17:54 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28268#discussion_r565514960

Comment:
indentation here is spaces, apparently

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR REVIEW] xbps-src: Clear subpkg data before printing subpkg
  2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
  2021-01-27 17:54 ` [PR REVIEW] " ericonr
@ 2021-01-27 17:54 ` ericonr
  2021-01-27 18:50 ` [PR PATCH] [Updated] " Vaelatern
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-01-27 17:54 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28268#discussion_r565515180

Comment:
I think this should be a revert for the commit that added it

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] xbps-src: Clear subpkg data before printing subpkg
  2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
  2021-01-27 17:54 ` [PR REVIEW] " ericonr
  2021-01-27 17:54 ` ericonr
@ 2021-01-27 18:50 ` Vaelatern
  2021-01-27 20:47 ` Vaelatern
  2021-01-27 20:47 ` [PR PATCH] [Merged]: " Vaelatern
  4 siblings, 0 replies; 6+ messages in thread
From: Vaelatern @ 2021-01-27 18:50 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages xbps-src-show-stuff
https://github.com/void-linux/void-packages/pull/28268

xbps-src: Clear subpkg data before printing subpkg
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28268.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-show-stuff-28268.patch --]
[-- Type: text/x-diff, Size: 2752 bytes --]

From 0f3243164d69a7a62b9db503c549127e87ec8a32 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:49:59 -0500
Subject: [PATCH 1/2] xbps-src: Improve the showing of variables

---
 xbps-src | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/xbps-src b/xbps-src
index fa677084ce0..2a4631c9938 100755
--- a/xbps-src
+++ b/xbps-src
@@ -836,6 +836,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+		. ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -859,6 +860,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+		. ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -886,6 +888,34 @@ case "$XBPS_TARGET" in
                 fi # The trailing space gets stripped before printing anyway
         done
         ;;
+    dbulk-dump)
+        read_pkg
+        for x in pkgname version revision; do
+            printf '%s: %s\n' "$x" "${!x}"
+        done
+        for x in hostmakedepends makedepends depends; do
+            arr=(${!x})
+            if [[ ${#arr} -gt 0 ]]; then
+                printf '%s:\n' "$x"
+                printf ' %s\n' "${arr[@]}"
+            fi
+        done
+        if [[ $subpackages ]]; then
+            printf 'subpackages:\n'
+            for x in ${subpackages}; do
+		. ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
+                ${x}_package
+                printf ' %s\n' "$x"
+                for x in depends; do
+                    arr=(${!x})
+                    if [[ ${#arr} -gt 0 ]]; then
+                        printf '  %s:\n' "$x"
+                        printf '   %s\n' "${arr[@]}"
+                    fi
+                done
+            done
+        fi
+        ;;
     show-options)
         read_pkg ignore-problems
         show_pkg_build_options

From f99708d0722c6357eeee418a6dece2e075579635 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:50:29 -0500
Subject: [PATCH 2/2] rust: rust-std never depended on itself

---
 srcpkgs/rust/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4d25635d409..6bb928e1478 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,7 +354,6 @@ rust-doc_package() {
 
 rust-std_package() {
 	short_desc+=" - standard library"
-	depends=""
 	pkg_install() {
 		vmove usr/lib/rustlib
 	}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] xbps-src: Clear subpkg data before printing subpkg
  2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
                   ` (2 preceding siblings ...)
  2021-01-27 18:50 ` [PR PATCH] [Updated] " Vaelatern
@ 2021-01-27 20:47 ` Vaelatern
  2021-01-27 20:47 ` [PR PATCH] [Merged]: " Vaelatern
  4 siblings, 0 replies; 6+ messages in thread
From: Vaelatern @ 2021-01-27 20:47 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages xbps-src-show-stuff
https://github.com/void-linux/void-packages/pull/28268

xbps-src: Clear subpkg data before printing subpkg
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28268.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-show-stuff-28268.patch --]
[-- Type: text/x-diff, Size: 2794 bytes --]

From 7f861962bc8799a9ef6ac21d2d072a479baae24e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 13:49:59 -0500
Subject: [PATCH 1/2] xbps-src: Improve the showing of variables

---
 xbps-src | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/xbps-src b/xbps-src
index fa677084ce0..77969af84a1 100755
--- a/xbps-src
+++ b/xbps-src
@@ -836,6 +836,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -859,6 +860,7 @@ case "$XBPS_TARGET" in
         read_pkg ignore-problems
         for sub_name in $subpackages; do
             if [ $sub_name = $XBPS_TARGET_PKG ]; then
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
                 ${sub_name}_package
             fi
         done
@@ -886,6 +888,34 @@ case "$XBPS_TARGET" in
                 fi # The trailing space gets stripped before printing anyway
         done
         ;;
+    dbulk-dump)
+        read_pkg
+        for x in pkgname version revision; do
+            printf '%s: %s\n' "$x" "${!x}"
+        done
+        for x in hostmakedepends makedepends depends; do
+            arr=(${!x})
+            if [[ ${#arr} -gt 0 ]]; then
+                printf '%s:\n' "$x"
+                printf ' %s\n' "${arr[@]}"
+            fi
+        done
+        if [[ $subpackages ]]; then
+            printf 'subpackages:\n'
+            for x in ${subpackages}; do
+                . ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh
+                ${x}_package
+                printf ' %s\n' "$x"
+                for x in depends; do
+                    arr=(${!x})
+                    if [[ ${#arr} -gt 0 ]]; then
+                        printf '  %s:\n' "$x"
+                        printf '   %s\n' "${arr[@]}"
+                    fi
+                done
+            done
+        fi
+        ;;
     show-options)
         read_pkg ignore-problems
         show_pkg_build_options

From 6cd2d8bb0712c0d011e7e9cef56802b20d5deede Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 27 Jan 2021 15:46:27 -0500
Subject: [PATCH 2/2] rust: rust-std never depended on itself

---
 srcpkgs/rust/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 4d25635d409..6bb928e1478 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -354,7 +354,6 @@ rust-doc_package() {
 
 rust-std_package() {
 	short_desc+=" - standard library"
-	depends=""
 	pkg_install() {
 		vmove usr/lib/rustlib
 	}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: xbps-src: Clear subpkg data before printing subpkg
  2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
                   ` (3 preceding siblings ...)
  2021-01-27 20:47 ` Vaelatern
@ 2021-01-27 20:47 ` Vaelatern
  4 siblings, 0 replies; 6+ messages in thread
From: Vaelatern @ 2021-01-27 20:47 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

xbps-src: Clear subpkg data before printing subpkg
https://github.com/void-linux/void-packages/pull/28268

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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] 6+ messages in thread

end of thread, other threads:[~2021-01-27 20:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 17:52 [PR PATCH] xbps-src: Clear subpkg data before printing subpkg Vaelatern
2021-01-27 17:54 ` [PR REVIEW] " ericonr
2021-01-27 17:54 ` ericonr
2021-01-27 18:50 ` [PR PATCH] [Updated] " Vaelatern
2021-01-27 20:47 ` Vaelatern
2021-01-27 20:47 ` [PR PATCH] [Merged]: " Vaelatern

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).