diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-09-19 13:57:58 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-09-19 13:57:58 +0000 |
| commit | be7e5e71a4291cc25d687742a4dfa030e4e10efd (patch) | |
| tree | b48c019851a76e4f5561cae87f55310d63ed8152 /sys-apps/kmod | |
| parent | old (diff) | |
| download | gentoo-2-be7e5e71a4291cc25d687742a4dfa030e4e10efd.tar.gz gentoo-2-be7e5e71a4291cc25d687742a4dfa030e4e10efd.tar.bz2 gentoo-2-be7e5e71a4291cc25d687742a4dfa030e4e10efd.zip | |
Check compiler (preprocessor) version only if it's GNU GCC wrt #485310 by "eroen"
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/kmod')
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-15.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 80ca0fde2472..cdba70b0357f 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/kmod # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.112 2013/08/25 14:57:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.113 2013/09/19 13:57:58 ssuominen Exp $ + + 19 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-15.ebuild, + kmod-9999.ebuild: + Check compiler (preprocessor) version only if it's GNU GCC wrt #485310 by + "eroen" 25 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> -kmod-14-r1.ebuild, -kmod-14-r2.ebuild: diff --git a/sys-apps/kmod/kmod-15.ebuild b/sys-apps/kmod/kmod-15.ebuild index 53fe6d5669a2..6ec5433665d0 100644 --- a/sys-apps/kmod/kmod-15.ebuild +++ b/sys-apps/kmod/kmod-15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.1 2013/08/24 12:03:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-15.ebuild,v 1.2 2013/09/19 13:57:58 ssuominen Exp $ EAPI=5 inherit autotools eutils libtool multilib toolchain-funcs versionator @@ -38,8 +38,8 @@ DEPEND="${RDEPEND} zlib? ( virtual/pkgconfig )" pkg_setup() { - version_is_at_least 4.6 $(gcc-version) || \ - die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020 + [[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \ + die "You need at least GNU GCC 4.6.x to build this package." #481020 } src_prepare() { diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index a2ed8f8b6333..22c74e7ec01c 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.64 2013/08/24 10:59:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.65 2013/09/19 13:57:58 ssuominen Exp $ EAPI=5 inherit autotools eutils libtool multilib toolchain-funcs versionator @@ -38,8 +38,8 @@ DEPEND="${RDEPEND} zlib? ( virtual/pkgconfig )" pkg_setup() { - version_is_at_least 4.6 $(gcc-version) || \ - die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020 + [[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \ + die "You need at least GNU GCC 4.6.x to build this package." #481020 } src_prepare() { |