* [PR PATCH] ZMusic: fix cross build
@ 2020-12-31 15:19 ndowens
2021-01-02 1:18 ` [PR REVIEW] " ericonr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: ndowens @ 2020-12-31 15:19 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] ZMusic: fix cross build
2020-12-31 15:19 [PR PATCH] ZMusic: fix cross build ndowens
@ 2021-01-02 1:18 ` ericonr
2021-01-02 1:19 ` ericonr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-01-02 1:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27579#discussion_r550827997
Comment:
Please see about upstreaming this one as well :)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: ZMusic: fix cross build
2020-12-31 15:19 [PR PATCH] ZMusic: fix cross build ndowens
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
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-01-02 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27579#issuecomment-753413799
Comment:
Otherwise, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: ZMusic: fix cross build
2020-12-31 15:19 [PR PATCH] ZMusic: fix cross build ndowens
2021-01-02 1:18 ` [PR REVIEW] " ericonr
2021-01-02 1:19 ` ericonr
@ 2021-01-02 1:19 ` ericonr
2021-01-02 2:14 ` [PR REVIEW] " ndowens
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-01-02 1:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
There's a merged pull request on the void-packages repository
ZMusic: fix cross build
https://github.com/void-linux/void-packages/pull/27579
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] ZMusic: fix cross build
2020-12-31 15:19 [PR PATCH] ZMusic: fix cross build ndowens
` (2 preceding siblings ...)
2021-01-02 1:19 ` [PR PATCH] [Merged]: " ericonr
@ 2021-01-02 2:14 ` ndowens
3 siblings, 0 replies; 5+ messages in thread
From: ndowens @ 2021-01-02 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27579#discussion_r550832237
Comment:
https://github.com/coelckers/ZMusic/pull/19
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-02 2:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-31 15:19 [PR PATCH] ZMusic: fix cross build ndowens
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
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).