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 903531382C5 for ; Mon, 18 Jan 2021 15:03:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D7C1E0636; Mon, 18 Jan 2021 15:03:01 +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 865AAE0636 for ; Mon, 18 Jan 2021 15:03:01 +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 2E71E340A8E for ; Mon, 18 Jan 2021 15:03:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F90292 for ; Mon, 18 Jan 2021 15:02:58 +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: <1610982172.f25a7ab45c1a7345d741c183bb96de0967b67db1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/gpac/gpac-1.0.1.ebuild media-video/gpac/gpac-9999.ebuild X-VCS-Directories: media-video/gpac/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f25a7ab45c1a7345d741c183bb96de0967b67db1 X-VCS-Branch: master Date: Mon, 18 Jan 2021 15:02:58 +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: fefd8969-ab4e-4572-97f1-513eedf5a8f8 X-Archives-Hash: cc61b93496e8735915e8b92106f18df7 commit: f25a7ab45c1a7345d741c183bb96de0967b67db1 Author: Sam James gentoo org> AuthorDate: Mon Jan 18 15:02:52 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 18 15:02:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25a7ab4 media-video/gpac: fix build on non amd64/x86 -mno-sse2 isn't valid on non amd64/x86. Bug: https://bugs.gentoo.org/749972 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> media-video/gpac/gpac-1.0.1.ebuild | 15 +++++++++++++-- media-video/gpac/gpac-9999.ebuild | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/media-video/gpac/gpac-1.0.1.ebuild b/media-video/gpac/gpac-1.0.1.ebuild index 806f4a7262b..8d9beec5a39 100644 --- a/media-video/gpac/gpac-1.0.1.ebuild +++ b/media-video/gpac/gpac-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -98,7 +98,6 @@ src_configure() { tc-export CC CXX AR RANLIB local myeconfargs=( - --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" --cc="$(tc-getCC)" --libdir="$(get_libdir)" --verbose @@ -134,6 +133,18 @@ src_configure() { $(my_use vorbis) $(my_use xvid) ) + + if use amd64 || use x86 ; then + # Don't pass -mno-sse2 on non amd64/x86 + myeconfargs+=( + --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" + ) + else + myeconfargs+=( + --extra-cflags="${CFLAGS}" + ) + fi + econf "${myeconfargs[@]}" } diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild index e5828cfed45..abfcbc0e5d9 100644 --- a/media-video/gpac/gpac-9999.ebuild +++ b/media-video/gpac/gpac-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,6 +25,7 @@ IUSE="a52 aac alsa cpu_flags_x86_sse2 debug dvb ffmpeg ipv6 jack jpeg jpeg2k lib BDEPEND="virtual/pkgconfig" RDEPEND=" media-libs/libogg + sys-libs/zlib a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) @@ -97,7 +98,6 @@ src_configure() { tc-export CC CXX AR RANLIB local myeconfargs=( - --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" --cc="$(tc-getCC)" --libdir="$(get_libdir)" --verbose @@ -133,6 +133,18 @@ src_configure() { $(my_use vorbis) $(my_use xvid) ) + + if use amd64 || use x86 ; then + # Don't pass -mno-sse2 on non amd64/x86 + myeconfargs+=( + --extra-cflags="${CFLAGS} $(usex cpu_flags_x86_sse2 '-msse2' '-mno-sse2')" + ) + else + myeconfargs+=( + --extra-cflags="${CFLAGS}" + ) + fi + econf "${myeconfargs[@]}" }