Re: [PR PATCH] [Updated] libguestfs: unbreak, enable musl

[Johnnynator <Johnnynator@users.noreply.github.com>]

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

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

https://github.com/Johnnynator/void-packages libguestfs
https://github.com/void-linux/void-packages/pull/28397

libguestfs: unbreak, enable musl
<!-- 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/28397.patch is attached

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

From 187f3da542ab29b00b1cadb2342e616c04a95e4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 1 Feb 2021 22:07:28 +0100
Subject: [PATCH] libguestfs: unbreak, enable musl

---
 srcpkgs/libguestfs/patches/conf.patch | 19 +++++++++++++++++++
 srcpkgs/libguestfs/template           |  8 ++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libguestfs/patches/conf.patch

diff --git a/srcpkgs/libguestfs/patches/conf.patch b/srcpkgs/libguestfs/patches/conf.patch
new file mode 100644
index 00000000000..6e59e74a908
--- /dev/null
+++ b/srcpkgs/libguestfs/patches/conf.patch
@@ -0,0 +1,19 @@
+--- configure	2021-01-06 11:07:19.837834801 +0100
++++ -	2021-02-01 21:59:49.975607517 +0100
+@@ -63266,7 +63266,7 @@
+         else
+             as_fn_error $? "/etc/os-release not available, please specify the distro using --with-distro=DISTRO" "$LINENO" 5
+         fi
+-
++fi
+      if case $DISTRO in #(
+   REDHAT | SUSE | OPENMANDRIVA | MAGEIA ) :
+     true ;; #(
+@@ -63313,7 +63313,6 @@
+ fi
+ 
+ 
+-fi
+ 
+ 
+ 
diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 339bdafce66..8fd4f17921a 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,5 +1,3 @@
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/29937/steps/shell_3/logs/stdio"
-
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.44.0
@@ -17,7 +15,7 @@ hostmakedepends="cpio gperf cdrtools flex pkg-config automake libtool qemu git
  ocaml ocaml-findlib perl-Module-Build perl hivex supermin
  $(vopt_if ruby ruby) $(vopt_if python python3) $(vopt_if go go) $(vopt_if php php) $(vopt_if lua lua53)"
 makedepends="ncurses-devel pcre-devel augeas-devel libxml2-devel gettext-devel file-devel jansson-devel
- yajl-devel perl $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
+ yajl-devel perl libtirpc-devel $(vopt_if ruby ruby-devel) $(vopt_if python python3-devel)
  $(vopt_if php php-devel) $(vopt_if lua lua53-devel) $(vopt_if fuse fuse-devel)"
 short_desc="Access and modify virtual machine disk image"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -31,9 +29,7 @@ conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.gpg"
 
 nocross=yes
-disable_parallel_build=yes
-
-archs="i686 x86_64 ppc64le"
+archs="i686* x86_64* ppc64le*"
 
 build_options="ruby python go php lua fuse"
 build_options_default="ruby fuse"