[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Pagano]

commit:     d71fe9c18bd7fe412185f3ca79379c631bde79b2
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 00:08:37 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 00:09:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71fe9c1

eclass: Move cpu optimization patch for older kernels.

See bug #678498

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 eclass/kernel-2.eclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index ece1edfb36c..6303e3e6c49 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1230,9 +1230,6 @@ unipatch() {
                local GCC_MAJOR_VER=$(gcc-major-version)
                        local GCC_MINOR_VER=$(gcc-minor-version)
 
-                       # support old kernels for a period. For now, remove as 
all gcc versions required are masked
-                       UNIPATCH_DROP+=" 
5010_enable-additional-cpu-optimizations-for-gcc.patch"
-
                        # optimization patch for gcc < 8.X and kernel > 4.13
                        if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} 
-gt 4 ]]; then
                                if kernel_is ge 4 13 ; then
@@ -1241,6 +1238,8 @@ unipatch() {
                        # optimization patch for gcc >= 8 and kernel ge 4.13
                        elif [[ "${GCC_MAJOR_VER}" -ge 8 ]]; then
                                if kernel_is ge 4 13; then
+                                       # support old kernels for a period. For 
now, remove as all gcc versions required are masked
+                                       UNIPATCH_DROP+=" 
5010_enable-additional-cpu-optimizations-for-gcc.patch"
                                        UNIPATCH_DROP+=" 
5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
                                fi
                        fi