[gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     2c614ff3eadeaac60d0f62d34b1f21db3869fceb
Author:     Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Fri Jul  3 14:07:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Jul  3 16:15:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c614ff3

media-libs/openh264: fix cross compiling

Closes: https://bugs.gentoo.org/730520
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/16571
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/openh264/openh264-2.1.1.ebuild | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/media-libs/openh264/openh264-2.1.1.ebuild b/media-libs/openh264/openh264-2.1.1.ebuild
index 1247581b4db..b18de1c269b 100644
--- a/media-libs/openh264/openh264-2.1.1.ebuild
+++ b/media-libs/openh264/openh264-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD"
 SLOT="0/6" # subslot = openh264 soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_avx2 +plugin utils"
+IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
 
@@ -36,24 +36,29 @@ multilib_src_configure() {
 }
 
 emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
 	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
 		PREFIX="${EPREFIX}/usr" \
 		LIBDIR_NAME="$(get_libdir)" \
 		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
 		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
 		HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \
+		ARCH="$(tc-arch)" \
 		$@
 }
 
 multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
+	local myopts="ENABLE64BIT=No"
 	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+		s390x|alpha|*64) myopts="ENABLE64BIT=Yes";;
 	esac
 
-	emakecmd ${mybits}
-	use plugin && emakecmd ${mybits} plugin
+	if use arm; then
+		myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)"
+	fi
+
+	emakecmd ${myopts}
+	use plugin && emakecmd ${myopts} plugin
 }
 
 multilib_src_install() {