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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7D87138359 for ; Fri, 3 Jul 2020 16:15:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B75C7E0844; Fri, 3 Jul 2020 16:15:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 988CDE0844 for ; Fri, 3 Jul 2020 16:15:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 389C934F031 for ; Fri, 3 Jul 2020 16:15:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4206B29A for ; Fri, 3 Jul 2020 16:15:48 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1593792921.2c614ff3eadeaac60d0f62d34b1f21db3869fceb.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openh264/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openh264/openh264-2.1.1.ebuild X-VCS-Directories: media-libs/openh264/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 2c614ff3eadeaac60d0f62d34b1f21db3869fceb X-VCS-Branch: master Date: Fri, 3 Jul 2020 16:15:48 +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: d64ea45e-d5a9-4e07-9e64-3fc7bc6f3d66 X-Archives-Hash: 1b71faf1cf74064547e25ab4e0f43df2 commit: 2c614ff3eadeaac60d0f62d34b1f21db3869fceb Author: Stephan Hartmann googlemail com> AuthorDate: Fri Jul 3 14:07:22 2020 +0000 Commit: Thomas Deutschmann gentoo 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 googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/16571 Signed-off-by: Thomas Deutschmann 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() {