[PR PATCH] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[PR PATCH] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages jre11-test
https://github.com/void-linux/void-packages/pull/42736

cross-vpkg-dummy: provide libthread_db.so.1 on glibc
this should fix issues with openjdk11-jre in void-packages/CI verify repository state on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**



A patch file from https://github.com/void-linux/void-packages/pull/42736.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jre11-test-42736.patch --]
[-- Type: text/x-diff, Size: 1319 bytes --]

From 75a3f441d1278fb6f7047614ad226b2db6bf6311 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 12 Mar 2023 18:25:40 -0400
Subject: [PATCH] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

this should fix issues with openjdk11-jre in void-packages/CI verify
repository state on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```
---
 srcpkgs/cross-vpkg-dummy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 75ac42f2c1ab..943bfae9ee38 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
 version=0.39
-revision=3
+revision=4
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -75,5 +75,5 @@ else
 	shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1"
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"
-	shlib_provides+=" ld64.so.2 ld.so.1"
+	shlib_provides+=" ld64.so.2 ld.so.1 libthread_db.so.1"
 fi

Re: [PR PATCH] [Updated] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages jre11-test
https://github.com/void-linux/void-packages/pull/42736

cross-vpkg-dummy: provide libthread_db.so.1 on glibc
this should fix issues with openjdk11-jre in makedepends and "verify repository state" CI on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

before:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': not found
```
after:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': provided by `cross-vpkg-dummy-0.39_4'
```



A patch file from https://github.com/void-linux/void-packages/pull/42736.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jre11-test-42736.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]

From 9c13664aef0d6ce86dba9c409332960d13f8ee7c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 12 Mar 2023 21:00:14 -0400
Subject: [PATCH 1/2] common/travis/check-install.sh: also fail on other
 failure modes

11 = EINVAL, which can come from conflict check and a few other places
---
 common/travis/check-install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index b5268085db59..943a6bc6211c 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -21,7 +21,8 @@ while read -r pkg; do
 				$ROOTDIR $ADDREPO \
 				-Sny \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
-			if [ $? -eq 8 ]; then
+			ret="$?"
+			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then
 				/bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m"
 				exit 1
 			fi

From 0f98776a6034740ee1d7d29b9e9ae26c5a181316 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 12 Mar 2023 18:25:40 -0400
Subject: [PATCH 2/2] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

this should fix issues with openjdk11-jre in void-packages/CI verify
repository state on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```
---
 srcpkgs/cross-vpkg-dummy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 75ac42f2c1ab..943bfae9ee38 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
 version=0.39
-revision=3
+revision=4
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -75,5 +75,5 @@ else
 	shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1"
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"
-	shlib_provides+=" ld64.so.2 ld.so.1"
+	shlib_provides+=" ld64.so.2 ld.so.1 libthread_db.so.1"
 fi

Re: cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42736#issuecomment-1466607695

Comment:
should this also be `repository=bootstrap`?

Re: [PR PATCH] [Updated] cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages jre11-test
https://github.com/void-linux/void-packages/pull/42736

cross-vpkg-dummy: provide libthread_db.so.1 on glibc
this should fix issues with openjdk11-jre in makedepends and "verify repository state" CI on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

before:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': not found
```
after:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': provided by `cross-vpkg-dummy-0.39_4'
```



A patch file from https://github.com/void-linux/void-packages/pull/42736.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jre11-test-42736.patch --]
[-- Type: text/x-diff, Size: 2644 bytes --]

From 9c13664aef0d6ce86dba9c409332960d13f8ee7c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 12 Mar 2023 21:00:14 -0400
Subject: [PATCH 1/2] common/travis/check-install.sh: also fail on other
 failure modes

11 = EINVAL, which can come from conflict check and a few other places
---
 common/travis/check-install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index b5268085db59..943a6bc6211c 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -21,7 +21,8 @@ while read -r pkg; do
 				$ROOTDIR $ADDREPO \
 				-Sny \
 				"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
-			if [ $? -eq 8 ]; then
+			ret="$?"
+			if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then
 				/bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m"
 				exit 1
 			fi

From b48ce9e87d48dd72aa8351200f13023b3f6395c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 12 Mar 2023 18:25:40 -0400
Subject: [PATCH 2/2] cross-vpkg-dummy: move to bootstrap, provide
 libthread_db.so.1 on glibc

this should fix issues with openjdk11-jre in void-packages/CI verify
repository state on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```
---
 srcpkgs/cross-vpkg-dummy/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 75ac42f2c1ab..baf92e2560c3 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,15 +1,13 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
 version=0.39
-revision=3
+revision=4
 build_style=meta
+depends="base-files>=0.126"
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="https://www.voidlinux.org/"
-
-depends="base-files>=0.126"
-
 provides="
 	kernel-libc-headers-9999_1
 	binutils-9999_1
@@ -62,6 +60,7 @@ shlib_provides="
 	libgnarl-12.so
 	libstdc++.so.6
 	libgfortran.so.5"
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	provides+=" musl-9999_1 musl-devel-9999_1"
@@ -75,5 +74,5 @@ else
 	shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1"
 	shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2"
 	shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1"
-	shlib_provides+=" ld64.so.2 ld.so.1"
+	shlib_provides+=" ld64.so.2 ld.so.1 libthread_db.so.1"
 fi

Re: [PR PATCH] [Merged]: cross-vpkg-dummy: provide libthread_db.so.1 on glibc

[classabbyamp]

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

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

cross-vpkg-dummy: provide libthread_db.so.1 on glibc
https://github.com/void-linux/void-packages/pull/42736

Description:
this should fix issues with openjdk11-jre in makedepends and "verify repository state" CI on cross:

```
openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1'
Transaction aborted due to unresolved shlibs.
```

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

before:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': not found
```
after:
```
[DEBUG] xbps_transaction_check_shlibs: checking for `libthread_db.so.1': provided by `cross-vpkg-dummy-0.39_4'
```