From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kodi-platform: fix cross-build
Date: Fri, 01 Jan 2021 21:34:35 +0100 [thread overview]
Message-ID: <20210101203435.oaiVThsbklSNWFSrZbV4YTmeZh59zWJKtMiHATt34dc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27608@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages kodi-platform
https://github.com/void-linux/void-packages/pull/27608
kodi-platform: fix cross-build
A patch file from https://github.com/void-linux/void-packages/pull/27608.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-platform-27608.patch --]
[-- Type: text/x-diff, Size: 1645 bytes --]
From fcca2082ddd6e804af034bea25ca048bbd6830e2 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Fri, 1 Jan 2021 10:14:09 -0600
Subject: [PATCH] kodi-platform: fix cross-build
---
srcpkgs/kodi-platform/template | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-platform/template b/srcpkgs/kodi-platform/template
index 71884f3ee38..653d6ec8f90 100644
--- a/srcpkgs/kodi-platform/template
+++ b/srcpkgs/kodi-platform/template
@@ -3,7 +3,8 @@ pkgname=kodi-platform
version=17.1.0
revision=1
build_style=cmake
-configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib"
+configure_args="-DCMAKE_INSTALL_LIBDIR=/usr/lib
+ -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
makedepends="kodi-devel tinyxml-devel p8-platform-devel"
short_desc="Kodi platform support library"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -11,7 +12,22 @@ license="GPL-2.0-or-later"
homepage="https://github.com/xbmc/kodi-platform"
distfiles="https://github.com/xbmc/kodi-platform/archive/${version}.tar.gz"
checksum=39de7eb6db14de3fa33ca0e56243c3307e7598187e73ad930dabccdf068bd9b2
-nocross="kodi cmake files use absolute paths"
+
+post_build() {
+ # Remove cross-cruft
+ if [ "$CROSS_BUILD" ]; then
+ vsed -e '/libdir/s,=.*,=/usr/lib,' \
+ -e '/CXX/s,=.*,=c++,' \
+ -e '/CC/s,=.*,=gcc,' \
+ -e "s,${XBPS_CROSS_BASE},,g" \
+ -i build/kodiplatform.pc
+
+ vsed -e 's,/usr//,/usr/,g' \
+ -e "s,${XBPS_CROSS_BASE},,g" \
+ -e 's,/usr/usr,/usr,g' \
+ -i build/kodiplatform-config.cmake
+ fi
+}
kodi-platform-devel_package() {
short_desc+=" - development files"
next prev parent reply other threads:[~2021-01-01 20:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-01 20:33 [PR PATCH] " ndowens
2021-01-01 20:34 ` ndowens [this message]
2021-01-03 1:14 ` [PR PATCH] [Updated] [WIP]kodi-platform: " ndowens
2021-01-03 1:15 ` ndowens
2021-01-03 1:15 ` [PR PATCH] [Closed]: " ndowens
2021-01-03 1:15 ` ndowens
2021-01-03 1:19 ` [PR PATCH] [Updated] " ndowens
2021-01-03 1:19 ` ndowens
2021-01-03 1:30 ` [PR PATCH] [Updated] " ndowens
2021-01-03 1:32 ` ndowens
2021-01-03 1:36 ` ndowens
2021-01-03 2:39 ` [PR PATCH] [Updated] " ndowens
2021-01-03 2:48 ` ndowens
2021-02-18 6:46 ` [PR REVIEW] kodi-platform: " ericonr
2021-02-18 6:46 ` ericonr
2021-03-16 21:03 ` ericonr
2021-03-16 21:03 ` [PR PATCH] [Closed]: " ericonr
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=20210101203435.oaiVThsbklSNWFSrZbV4YTmeZh59zWJKtMiHATt34dc@z \
--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).