From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1B98C138A1A for ; Fri, 13 Feb 2015 01:32:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95E39E0831; Fri, 13 Feb 2015 01:32:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C5B4E0831 for ; Fri, 13 Feb 2015 01:32:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 875073406A0 for ; Fri, 13 Feb 2015 01:31:56 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2195) id 078AF11A2C; Fri, 13 Feb 2015 01:30:51 +0000 (UTC) From: "Mike Pagano (mpagano)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mpagano@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: kernel-2.eclass X-VCS-Directories: eclass X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150213013051.078AF11A2C@oystercatcher.gentoo.org> Date: Fri, 13 Feb 2015 01:30:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1cf7ccc3-1c3c-4365-99e0-e670706ef0a9 X-Archives-Hash: 29ab05080cb634922389c94f7244a332 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}"