From 10b599265ca78331a7c4d8b0d32ca82398127b71 Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Fri, 28 Nov 2014 17:40:20 +0000 Subject: [PATCH] Adjust sparc warning. See bug #529682 --- eclass/ChangeLog | 5 ++++- eclass/kernel-2.eclass | 24 +++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 46f7bd633c26..c0b194bfa40e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1446 2014/11/26 00:34:41 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1447 2014/11/28 17:40:20 mpagano Exp $ + + 28 Nov 2014; Michael Pagano kernel-2.eclass: + Adjust sparc warning. See bug #529682 26 Nov 2014; Brian Evans musql-cmake.eclass, mysql-multilib.eclass: diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index de84e8f07e76..4b850146e33e 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -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.296 2014/04/21 00:08:15 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.297 2014/11/28 17:40:20 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -859,16 +859,18 @@ postinst_sources() { KV_MINOR=$(get_version_component_range 2 ${OKV}) KV_PATCH=$(get_version_component_range 3 ${OKV}) if [[ "$(tc-arch)" = "sparc" ]]; then - if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] ; then - echo - elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" - elog "you now need to do" - elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" - elog "instead of just" - elog " make" - elog "to compile the kernel. For more information please browse to" - elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" - echo + if [[ $(gcc-major-version) -lt 4 && $(gcc-minor-version) -lt 4 ]]; then + if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] ; then + echo + elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" + elog "you now need to do" + elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" + elog "instead of just" + elog " make" + elog "to compile the kernel. For more information please browse to" + elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" + echo + fi fi fi } -- 2.26.2