From d8bdcbc565535962f5579c4693784b1ee1547525 Mon Sep 17 00:00:00 2001 From: Amy Winston Date: Sun, 24 Jul 2016 12:00:23 +0200 Subject: [PATCH] media-video/vlc: fix compiler type check Package-Manager: portage-2.2.28 --- media-video/vlc/vlc-2.2.1-r1.ebuild | 4 ++-- media-video/vlc/vlc-2.2.4.ebuild | 4 ++-- media-video/vlc/vlc-2.2.9999.ebuild | 4 ++-- media-video/vlc/vlc-9999.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 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..76fe9c6433d3 100644 --- a/media-video/vlc/vlc-2.2.1-r1.ebuild +++ b/media-video/vlc/vlc-2.2.1-r1.ebuild @@ -213,7 +213,7 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then + if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; 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 @@ -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-getCC)" == "*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 39681588dcea..35b42eba6a2b 100644 --- a/media-video/vlc/vlc-2.2.4.ebuild +++ b/media-video/vlc/vlc-2.2.4.ebuild @@ -239,7 +239,7 @@ PATCHES=( S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then + if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; 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 @@ -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-getCC)" == "*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..62cc01049f3a 100644 --- a/media-video/vlc/vlc-2.2.9999.ebuild +++ b/media-video/vlc/vlc-2.2.9999.ebuild @@ -209,7 +209,7 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then + if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; 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 @@ -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-getCC)" == "*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..1b4e268fc94c 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -212,7 +212,7 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" pkg_setup() { - if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then + if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == "*gcc*" ]] ; then if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; 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 @@ -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-getCC)" == "*gcc*" ]] ; then sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die fi -- 2.26.2