Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] calf: fix cross
Date: Sun, 02 Jan 2022 12:46:57 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34807@inbox.vuxu.org> (raw)

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

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

https://github.com/paper42/void-packages calf-cross
https://github.com/void-linux/void-packages/pull/34807

calf: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34807.patch is attached

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

From ba35f8bc7ca333473c675d1872c227c9e6dacde2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 2 Jan 2022 12:46:21 +0100
Subject: [PATCH] calf: fix cross

---
 srcpkgs/calf/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 929f40ad902c..cd56434627d7 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -3,6 +3,7 @@ pkgname=calf
 version=0.90.3
 revision=3
 build_style=gnu-configure
+build_helper=qemu
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"
 makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel
@@ -16,7 +17,6 @@ homepage="http://calf-studio-gear.org"
 changelog="https://raw.githubusercontent.com/calf-studio-gear/calf/master/ChangeLog"
 distfiles="https://github.com/calf-studio-gear/calf/archive/${version}.tar.gz"
 checksum=8781cbd1a81dec59b5923a23141ab2ca74e0e724389e15ffcf3820ace138a46c
-nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/6795/steps/shell_3/logs/stdio"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) configure_args+=" --enable-sse";;
@@ -25,3 +25,7 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
+
+pre_install() {
+	vsed -e "s|exec |exec /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static |" -i src/calfmakerdf
+}

             reply	other threads:[~2022-01-02 11:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-02 11:46 paper42 [this message]
2022-01-02 14:35 ` [PR PATCH] [Updated] " paper42
2022-01-02 14:36 ` paper42
2022-01-03  0:21 ` [PR PATCH] [Merged]: " paper42

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-34807@inbox.vuxu.org \
    --to=paper42@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).