commit: bbd3998a90dd8d83c26639a1b3e42b83826f7059
Author: Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 20:30:51 2016 +0000
Commit: Amy Winston <amynka <AT> gentoo <DOT> 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
