summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2019-05-10 22:16:16 +0100
committerBertrand Jacquin <bertrand@jacquin.bzh>2019-05-11 20:46:05 +0100
commitcef1202f7715e58241d562441b043afd9c17ce26 (patch)
tree78ec9eb24a090ee6260318d6e191aed77cfa54dd
parentprofiles/common: enable build and savedconfig USE flag for sys-kernel/stable-... (diff)
downloadportage-cef1202f7715e58241d562441b043afd9c17ce26.tar.xz
eclass/linux-build: improve config diff
ignore CONFIG_GCC_VERSION
-rw-r--r--eclass/linux-build.eclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/linux-build.eclass b/eclass/linux-build.eclass
index 4922ded8..20e056d0 100644
--- a/eclass/linux-build.eclass
+++ b/eclass/linux-build.eclass
@@ -313,8 +313,12 @@ _linux-build_src_prepare_build() {
emake olddefconfig "${myopt[@]}"
fi
- if diff -Nu0 "${BUILDDIR}/.config.old" "${BUILDDIR}/.config" \
- | egrep -q '^(\-|\+)CONFIG_' ; then
+ if ! diff -q \
+ --ignore-matching-lines '^# ' \
+ --ignore-matching-lines '^CONFIG_GCC_VERSION=' \
+ --ignore-matching-lines '^CONFIG_CLANG_VERSION=' \
+ "${BUILDDIR}/.config.old" "${BUILDDIR}/.config" ; then
+
eerror "You configuration is not up to date"
diff -Nu "${BUILDDIR}/.config.old" "${BUILDDIR}/.config"
die "Bad configuration"