[PR PATCH] base-files: don't include lib32 files for musl

[PR PATCH] base-files: don't include lib32 files for musl

[JamiKettunen]

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

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

https://github.com/JamiKettunen/void-packages no-musl-multilib-base-files
https://github.com/void-linux/void-packages/pull/40659

base-files: don't include lib32 files for musl
Multilib on Void is [already only supported on glibc](https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories) and as per the musl libc FAQ [there is no ldconfig](https://wiki.musl-libc.org/faq.html) (`/bin/ldconfig: symbolic link to true`).

<!-- 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/40659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-no-musl-multilib-base-files-40659.patch --]
[-- Type: text/x-diff, Size: 1433 bytes --]

From 31ea631ca310f433f109a957b78493b256304466 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 21 Nov 2022 13:19:25 +0200
Subject: [PATCH] base-files: don't include lib32 files for musl

Multilib on Void is already only supported on glibc[1] and as per the
musl libc FAQ[2] there is no ldconfig.

[1] https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories
[2] https://wiki.musl-libc.org/faq.html
---
 srcpkgs/base-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index be6384f942c6..0b82d4077658 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=14
+revision=15
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -46,8 +46,8 @@ do_install() {
 		ln -snrf "${DESTDIR}/usr/lib" \
 			"${DESTDIR}/${d}${XBPS_TARGET_WORDSIZE}"
 	done
-	# Populate 32-bit lib files on 64-bit systems, for multilib.
-	if [ "${XBPS_TARGET_WORDSIZE}" = "64" ]; then
+	# Populate 32-bit lib files on 64-bit glibc systems, for multilib.
+	if [ "${XBPS_TARGET_WORDSIZE}" = "64" ] && [ "${XBPS_TARGET_LIBC}" = "glibc" ]; then
 		vmkdir usr/lib32
 		ln -snrf "${DESTDIR}/usr/lib32" "${DESTDIR}/lib32"
 		ln -sf ../lib/locale "${DESTDIR}/usr/lib32/locale"

Re: base-files: don't include lib32 files for musl

[vincele]

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

New comment by vincele on void-packages repository

https://github.com/void-linux/void-packages/pull/40659#issuecomment-1363279086

Comment:
This looks sensible, I got this here (x86_64-musl):
```
# find / -type d -name lib32 2>/dev/null
/usr/lib32
# ls -lah /usr/lib32
total 0
lrwxrwxrwx 1 root root 13 Sep 13 19:54 locale -> ../lib/locale
# ls -lah /usr/lib/locale
ls: cannot access '/usr/lib/locale': No such file or directory
```
So, LGTM...

Re: base-files: don't include lib32 files for musl

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/40659#issuecomment-1480471781

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: base-files: don't include lib32 files for musl

[github-actions]

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

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

base-files: don't include lib32 files for musl
https://github.com/void-linux/void-packages/pull/40659

Description:
Multilib on Void is [already only supported on glibc](https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories) and as per the musl libc FAQ [there is no ldconfig](https://wiki.musl-libc.org/faq.html) (`/bin/ldconfig: symbolic link to true`).

<!-- 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
-->

Re: [PR PATCH] [Updated] base-files: don't include lib32 files for musl

[JamiKettunen]

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

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

https://github.com/JamiKettunen/void-packages no-musl-multilib-base-files
https://github.com/void-linux/void-packages/pull/40659

base-files: don't include lib32 files for musl
Multilib on Void is [already only supported on glibc](https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories) and as per the musl libc FAQ [there is no ldconfig](https://wiki.musl-libc.org/faq.html) (`/bin/ldconfig: symbolic link to true`).

<!-- 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/40659.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-no-musl-multilib-base-files-40659.patch --]
[-- Type: text/x-diff, Size: 1433 bytes --]

From 553cd47c381d1183d78294400bf0552f233c3f55 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 21 Nov 2022 13:19:25 +0200
Subject: [PATCH] base-files: don't include lib32 files for musl

Multilib on Void is already only supported on glibc[1] and as per the
musl libc FAQ[2] there is no ldconfig.

[1] https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories
[2] https://wiki.musl-libc.org/faq.html
---
 srcpkgs/base-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index c3b59c8e6cd28..c9db827fe55b4 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.143
-revision=3
+revision=4
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -46,8 +46,8 @@ do_install() {
 		ln -snrf "${DESTDIR}/usr/lib" \
 			"${DESTDIR}/${d}${XBPS_TARGET_WORDSIZE}"
 	done
-	# Populate 32-bit lib files on 64-bit systems, for multilib.
-	if [ "${XBPS_TARGET_WORDSIZE}" = "64" ]; then
+	# Populate 32-bit lib files on 64-bit glibc systems, for multilib.
+	if [ "${XBPS_TARGET_WORDSIZE}" = "64" ] && [ "${XBPS_TARGET_LIBC}" = "glibc" ]; then
 		vmkdir usr/lib32
 		ln -snrf "${DESTDIR}/usr/lib32" "${DESTDIR}/lib32"
 		ln -sf ../lib/locale "${DESTDIR}/usr/lib32/locale"

Re: [PR PATCH] [Merged]: base-files: don't include lib32 files for musl

[classabbyamp]

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

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

base-files: don't include lib32 files for musl
https://github.com/void-linux/void-packages/pull/40659

Description:
Multilib on Void is [already only supported on glibc](https://docs.voidlinux.org/xbps/repositories/index.html#subrepositories) and as per the musl libc FAQ [there is no ldconfig](https://wiki.musl-libc.org/faq.html) (`/bin/ldconfig: symbolic link to true`).

<!-- 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
-->