From: Ilya Tumaykin Date: Thu, 20 Oct 2016 21:51:29 +0000 (+0300) Subject: media-video/mpv: do compiler checks in pkg_setup() too X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8238093ef645e6b0f9e985a736c230aa2fec9af7;p=gentoo.git media-video/mpv: do compiler checks in pkg_setup() too Also reorder compiler check conditions for clarity. Signed-off-by: David Seifert --- diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 950092a5a9fa..3e2347f8ae64 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -128,12 +128,21 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" ) -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then +mpv_check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]] && use vaapi && use egl && ! tc-has-tls; then die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3." fi } +pkg_pretend() { + mpv_check_compiler +} + +pkg_setup() { + mpv_check_compiler + python-any-r1_pkg_setup +} + src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die