summaryrefslogtreecommitdiff
path: root/scripts/config/symbol.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-10-28 14:09:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-10-28 14:09:12 +0000
commit5e48d47dfe7134080ef13fddb506a461d109a2de (patch)
treefbb15e9f7b142cd503ce403f7385f1541ba8ee52 /scripts/config/symbol.c
parentab29084cdbd0b1aca1cff4d56856bbdadb065132 (diff)
downloadmtk-20170518-5e48d47dfe7134080ef13fddb506a461d109a2de.zip
mtk-20170518-5e48d47dfe7134080ef13fddb506a461d109a2de.tar.gz
mtk-20170518-5e48d47dfe7134080ef13fddb506a461d109a2de.tar.bz2
scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)
SVN-Revision: 28658
Diffstat (limited to 'scripts/config/symbol.c')
-rw-r--r--scripts/config/symbol.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c
index 2c1392a..1d718da 100644
--- a/scripts/config/symbol.c
+++ b/scripts/config/symbol.c
@@ -56,7 +56,6 @@ void sym_init(void)
sym = sym_lookup("ARCH", 0);
sym->type = S_STRING;
- sym->flags |= SYMBOL_AUTO;
p = getenv("ARCH");
if (p)
sym_add_default(sym, p);
@@ -362,11 +361,14 @@ void sym_calc_value(struct symbol *sym)
sym->curr.val = sym_calc_choice(sym);
sym_validate_range(sym);
- if (memcmp(&oldval, &sym->curr, sizeof(oldval)))
+ if (memcmp(&oldval, &sym->curr, sizeof(oldval))) {
+ sym->flags &= ~SYMBOL_VALID;
sym_set_changed(sym);
-
- if (modules_sym == sym)
- modules_val = modules_sym->curr.tri;
+ if (modules_sym == sym) {
+ sym_set_all_changed();
+ modules_val = modules_sym->curr.tri;
+ }
+ }
if (sym_is_choice(sym)) {
int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE);
@@ -377,6 +379,9 @@ void sym_calc_value(struct symbol *sym)
sym_set_changed(e->right.sym);
}
}
+
+ if (sym->flags & SYMBOL_AUTO)
+ sym->flags &= ~SYMBOL_WRITE;
}
void sym_clear_all_valid(void)
@@ -462,8 +467,6 @@ bool sym_set_tristate_value(struct symbol *sym, tristate val)
sym->user.tri = val;
if (oldval != val) {
sym_clear_all_valid();
- if (sym == modules_sym)
- sym_set_all_changed();
}
return true;
@@ -756,6 +759,7 @@ struct symbol **sym_re_search(const char *pattern)
return NULL;
}
}
+ sym_calc_value(sym);
sym_arr[cnt++] = sym;
}
if (sym_arr)