diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2015-03-20 00:13:32 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2015-03-20 00:13:32 +0000 |
| commit | b81c394677e9e78faa817b86c34a5afff8ff2f05 (patch) | |
| tree | 8391546fa64375f0d4438f6c249d5dcfcaebcfbe /eclass | |
| parent | Version bump to 3.0 = upstream udev-219. (diff) | |
| download | gentoo-2-b81c394677e9e78faa817b86c34a5afff8ff2f05.tar.gz gentoo-2-b81c394677e9e78faa817b86c34a5afff8ff2f05.tar.bz2 gentoo-2-b81c394677e9e78faa817b86c34a5afff8ff2f05.zip | |
Move cpu-optimation removal. See bug #542810.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 29 |
2 files changed, 21 insertions, 13 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f2a9b66c153b..17605b59859b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1568 2015/03/19 09:57:43 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1569 2015/03/20 00:13:32 mpagano Exp $ + + 20 Mar 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass: + Move cpu-optimation removal. See bug #542810 19 Mar 2015; <chewi@gentoo.org> java-pkg-simple.eclass: Allow jar to be named something other than ${PN}.jar. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 4a0e0a6d0b6e..f7738658e251 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.300 2015/02/27 23:44:41 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.301 2015/03/20 00:13:32 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -157,22 +157,11 @@ handle_genpatches() { 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}" debug-print "genpatches tarball: $tarball" fi - GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}" done } @@ -1001,6 +990,22 @@ unipatch() { done UNIPATCH_DROP+=" $(basename ${j})" done + else + 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 + if [[ $UNIPATCH_DROP != *"5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"* ]]; then + UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch" + fi + else + if [[ $UNIPATCH_DROP != *"5000_enable-additional-cpu-optimizations-for-gcc.patch"* ]]; then + #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch + UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch" + fi + fi fi done |