From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] ZMusic: fix cross build
Date: Thu, 31 Dec 2020 16:19:42 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27579@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages Zmusic
https://github.com/void-linux/void-packages/pull/27579
ZMusic: fix cross build
A patch file from https://github.com/void-linux/void-packages/pull/27579.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Zmusic-27579.patch --]
[-- Type: text/x-diff, Size: 1884 bytes --]
From dfee2deab309b66eb84a193dff982ce6b29913a8 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 31 Dec 2020 09:20:46 -0600
Subject: [PATCH] ZMusic: fix cross build
---
srcpkgs/ZMusic/patches/0001-fix-cross.patch | 28 +++++++++++++++++++++
srcpkgs/ZMusic/template | 1 -
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ZMusic/patches/0001-fix-cross.patch
diff --git a/srcpkgs/ZMusic/patches/0001-fix-cross.patch b/srcpkgs/ZMusic/patches/0001-fix-cross.patch
new file mode 100644
index 00000000000..ede6c979833
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/0001-fix-cross.patch
@@ -0,0 +1,28 @@
+From b430f543c850acfb98751bfcf5343afb397cf049 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 31 Dec 2020 09:18:14 -0600
+Subject: [PATCH] fix cross
+
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git CMakeLists.txt CMakeLists.txt
+index 5f4cb14..28e622b 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -24,11 +24,6 @@ if( FORCE_CROSSCOMPILE )
+ set( CMAKE_CROSSCOMPILING TRUE )
+ endif()
+
+-if(CMAKE_CROSSCOMPILING)
+- set(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Export file from native build.")
+- include(${IMPORT_EXECUTABLES})
+-endif()
+-
+
+ # Macro for building libraries without debugging information
+ macro( make_release_only )
+--
+2.30.0
+
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index b75b6d0c409..4151153cc83 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/coelckers/ZMusic"
distfiles="${homepage}/archive/${version}.tar.gz"
checksum=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
-nocross=yes
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" musl-fts-devel"
next reply other threads:[~2020-12-31 15:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-31 15:19 ndowens [this message]
2021-01-02 1:18 ` [PR REVIEW] " ericonr
2021-01-02 1:19 ` ericonr
2021-01-02 1:19 ` [PR PATCH] [Merged]: " ericonr
2021-01-02 2:14 ` [PR REVIEW] " ndowens
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-27579@inbox.vuxu.org \
--to=ndowens@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).