Github messages for voidlinux
 help / color / mirror / Atom feed
From: marmeladema <marmeladema@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] kodi: enable cross compilation for 32bit arm architectures
Date: Wed, 28 Apr 2021 01:04:50 +0200	[thread overview]
Message-ID: <20210427230450.qLWH1duZcpE4Wr5qyjk59vMUHN0cZT-QRuZxcM9XAN0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29517@inbox.vuxu.org>

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

There is an updated pull request by marmeladema against master on the void-packages repository

https://github.com/marmeladema/void-packages kodi-arm-32bit
https://github.com/void-linux/void-packages/pull/29517

kodi: enable cross compilation for 32bit arm architectures
<!-- 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/29517.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kodi-arm-32bit-29517.patch --]
[-- Type: text/x-diff, Size: 1728 bytes --]

From daed8f78740b10f4f26a80953388d47d0439c4bf Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures

---
 srcpkgs/kodi/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8bb2a2965731..a8f26288639e 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -42,7 +42,7 @@ fi
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -81,12 +81,6 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
-		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
 		# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
@@ -98,6 +92,16 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
+	hostmakedepends+=" libwaylandpp-devel"
+	makedepends+=" python3-devel ffmpeg-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	LDFLAGS+=" -latomic"
 fi
 
 pre_configure() {

  parent reply	other threads:[~2021-04-27 23:04 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 22:23 [PR PATCH] " marmeladema
2021-03-16 22:25 ` marmeladema
2021-03-16 23:45 ` [PR PATCH] [Updated] " marmeladema
2021-03-16 23:50 ` marmeladema
2021-04-11  3:50 ` [PR REVIEW] " ericonr
2021-04-11  3:50 ` ericonr
2021-04-27 23:04 ` marmeladema [this message]
2021-04-27 23:06 ` marmeladema
2021-04-27 23:12 ` [PR REVIEW] " ericonr
2021-04-27 23:12 ` ericonr
2021-04-27 23:16 ` [PR PATCH] [Updated] " marmeladema
2021-04-27 23:16 ` [PR REVIEW] " marmeladema
2021-04-27 23:16 ` marmeladema
2021-04-27 23:35 ` [PR PATCH] [Merged]: " 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=20210427230450.qLWH1duZcpE4Wr5qyjk59vMUHN0cZT-QRuZxcM9XAN0@z \
    --to=marmeladema@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).