From 40f3f74c0899da2ae7785ee51d9991f4786ca42d Mon Sep 17 00:00:00 2001 From: John 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 0000000000..6e59e74a90 --- /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 339bdafce6..8fd4f17921 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 " @@ -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"