diff options
| author |   Amy Winston <amynka@gentoo.org> | 2016-07-25 22:30:51 +0200 |
|---|---|---|
| committer | Amy Winston <amynka@gentoo.org> | 2016-07-25 22:30:51 +0200 |
| commit | bbd3998a90dd8d83c26639a1b3e42b83826f7059 (patch) | |
| tree | 7e60b05d9e770535e6f000731f10db950ed468b3 | |
| parent | dev-python/zake: Switch to brace expansion. (diff) | |
| download | gentoo-bbd3998a90dd8d83c26639a1b3e42b83826f7059.tar.gz gentoo-bbd3998a90dd8d83c26639a1b3e42b83826f7059.tar.bz2 gentoo-bbd3998a90dd8d83c26639a1b3e42b83826f7059.zip | |
media-video/vlc: fix compiler type check
Package-Manager: portage-2.2.28
| -rw-r--r-- | media-video/vlc/vlc-2.2.1-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.4.ebuild | 8 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.9999.ebuild | 8 | ||||
| -rw-r--r-- | 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 b2dbdf0af4ce..119a8244ece4 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 e874b8c647aa..1ae2aa526c40 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 2ca5cafb01e3..a68d243f0324 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 0ad493800418..ebcd381fa1bd 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 |