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 BC37913832E for ; Mon, 25 Jul 2016 20:32:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DFA8E09A9; Mon, 25 Jul 2016 20:32:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E75A9E09A9 for ; Mon, 25 Jul 2016 20:32:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32D92340BF4 for ; Mon, 25 Jul 2016 20:32:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC07078B for ; Mon, 25 Jul 2016 20:32:39 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1469478651.bbd3998a90dd8d83c26639a1b3e42b83826f7059.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-2.2.1-r1.ebuild media-video/vlc/vlc-2.2.4.ebuild media-video/vlc/vlc-2.2.9999.ebuild media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: bbd3998a90dd8d83c26639a1b3e42b83826f7059 X-VCS-Branch: master Date: Mon, 25 Jul 2016 20:32:39 +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-Archives-Salt: 18f6e9fd-0d79-40b3-90f9-6fb8d85667fb X-Archives-Hash: 94d372234fcab089c912a3e3f6e32073 commit: bbd3998a90dd8d83c26639a1b3e42b83826f7059 Author: Amy Winston gentoo org> AuthorDate: Mon Jul 25 20:30:51 2016 +0000 Commit: Amy Winston gentoo org> CommitDate: Mon Jul 25 20:30:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd3998a media-video/vlc: fix compiler type check Package-Manager: portage-2.2.28 media-video/vlc/vlc-2.2.1-r1.ebuild | 8 ++++---- media-video/vlc/vlc-2.2.4.ebuild | 8 ++++---- media-video/vlc/vlc-2.2.9999.ebuild | 8 ++++---- media-video/vlc/vlc-9999.ebuild | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild index b2dbdf0..119a824 100644 --- a/media-video/vlc/vlc-2.2.1-r1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then fi fi -inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} +inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -213,8 +213,8 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then - if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then + if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then + if ! version_is_at_least 4.5 $(gcc-version) ; then die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." fi fi @@ -236,7 +236,7 @@ src_prepare() { # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] # # https://gcc.gnu.org/c99status.html - if [[ "$(tc-getCC)" == *"gcc"* ]] ; then + if tc-is-gcc ; then sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi diff --git a/media-video/vlc/vlc-2.2.4.ebuild b/media-video/vlc/vlc-2.2.4.ebuild index e874b8c..1ae2aa5 100644 --- a/media-video/vlc/vlc-2.2.4.ebuild +++ b/media-video/vlc/vlc-2.2.4.ebuild @@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then fi fi -inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} +inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -239,8 +239,8 @@ PATCHES=( S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then - if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then + if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then + if ! version_is_at_least 4.5 $(gcc-version) ; then die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." fi fi @@ -262,7 +262,7 @@ src_prepare() { # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] # # https://gcc.gnu.org/c99status.html - if [[ "$(tc-getCC)" == *"gcc"* ]] ; then + if tc-is-gcc ; then sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild index 2ca5caf..a68d243 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then fi fi -inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} +inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -209,8 +209,8 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then - if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then + if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then + if ! version_is_at_least 4.5 $(gcc-version) ; then die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." fi fi @@ -232,7 +232,7 @@ src_prepare() { # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] # # https://gcc.gnu.org/c99status.html - if [[ "$(tc-getCC)" == *"gcc"* ]] ; then + if tc-is-gcc ; then sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 0ad4938..ebcd381 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then fi fi -inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} +inherit eutils multilib autotools toolchain-funcs flag-o-matic versionator virtualx ${SCM} MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" @@ -212,8 +212,8 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then - if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then + if [[ "${MERGE_TYPE}" != "binary" ]] && tc-is-gcc ; then + if ! version_is_at_least 4.5 $(gcc-version) ; then die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754." fi fi @@ -235,7 +235,7 @@ src_prepare() { # config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas] # # https://gcc.gnu.org/c99status.html - if [[ "$(tc-getCC)" == *"gcc"* ]] ; then + if tc-is-gcc ; then sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi