mpagano 15/02/13 01:30:51 Modified: kernel-2.eclass Log: Handle cpu optimization patch for different gcc versions
Revision Changes Path 1.298 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.298&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.298&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.297&r2=1.298 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- kernel-2.eclass 28 Nov 2014 17:40:20 -0000 1.297 +++ kernel-2.eclass 13 Feb 2015 01:30:50 -0000 1.298 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.297 2014/11/28 17:40:20 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.298 2015/02/13 01:30:50 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -157,6 +157,16 @@ if use experimental ; then UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" debug-print "genpatches tarball: $tarball" + + # check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010 + if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then + # drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch + UNIPATCH_EXCLUDE+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch" + else + #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch + UNIPATCH_EXCLUDE+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" + fi + fi else UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
