From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE94815838C for ; Sun, 21 Jan 2024 04:41:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0160E29AF; Sun, 21 Jan 2024 04:41:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7D5CE29AF for ; Sun, 21 Jan 2024 04:41:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D606A34329F for ; Sun, 21 Jan 2024 04:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 475DC14B5 for ; Sun, 21 Jan 2024 04:41:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705812069.659530b54968511a266fe0ecaae1cca560dca2d6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/kodi-9999.ebuild X-VCS-Directories: media-tv/kodi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 659530b54968511a266fe0ecaae1cca560dca2d6 X-VCS-Branch: master Date: Sun, 21 Jan 2024 04:41:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b621458c-1dc9-403b-af41-9c036c04d8f4 X-Archives-Hash: 29ce19297031c77f66c9bd51d1914fe3 commit: 659530b54968511a266fe0ecaae1cca560dca2d6 Author: James Le Cuirot gentoo org> AuthorDate: Sun Dec 24 14:46:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 21 04:41:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659530b5 media-tv/kodi: Fix cross-compiling by building native tools separately The native tools needed for building were seemingly handled automatically when cross-compiling before, but now they need to be explicitly built beforehand. Conversely, a pure native build now builds these tools with CMake rather than Autotools, so there is no longer any need to run eautoreconf and friends in this case. Signed-off-by: James Le Cuirot gentoo.org> Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> media-tv/kodi/kodi-9999.ebuild | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 5d6b97caa74d..503c3d27ca41 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -30,7 +30,8 @@ PYTHON_COMPAT=( python3_{10..12} ) CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" -inherit cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 xdg +inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \ + toolchain-funcs xdg DESCRIPTION="A free and open source media-player and entertainment hub" HOMEPAGE="https://kodi.tv/" @@ -415,10 +416,26 @@ src_configure() { # https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e filter-lto + if tc-is-cross-compiler; then + for t in "${NATIVE_TOOLS[@]}" ; do + pushd "${S}/tools/depends/native/$t/src" >/dev/null || die + econf_build + install -m0755 /dev/null "$t" || die # Actually build later. + mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" ) + popd >/dev/null || die + done + fi + cmake_src_configure } src_compile() { + if tc-is-cross-compiler; then + for t in "${NATIVE_TOOLS[@]}" ; do + emake -C "${S}/tools/depends/native/$t/src" + done + fi + cmake_src_compile all use doc && cmake_build doc use test && cmake_build kodi-test