From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libguestfs: unbreak, enable musl
Date: Mon, 01 Feb 2021 22:17:18 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28397@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
There is a new 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: 2397 bytes --]
From 8721cfc4afeb64ed92cad428f20d1761c7a64067 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 | 6 ++----
2 files changed, 21 insertions(+), 4 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..11abbbc0ae9 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>"
@@ -33,7 +31,7 @@ conf_files="etc/libguestfs-tools.conf
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"
next reply other threads:[~2021-02-01 21:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-01 21:17 Johnnynator [this message]
2021-02-01 21:34 ` [PR PATCH] [Updated] " Johnnynator
2021-02-01 21:34 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28397@inbox.vuxu.org \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).