Add macosx fix from #1407

[openwrt.git] / scripts / gen_busybox_menuconfig.pl

diff --git a/scripts/gen_busybox_menuconfig.pl b/scripts/gen_busybox_menuconfig.pl
old mode 100644 (file)
new mode 100755 (executable)
index 5fe6478..0128bf7
--- a/scripts/gen_busybox_menuconfig.pl
+++ b/scripts/gen_busybox_menuconfig.pl
@@ -16,9 +16,9 @@ my %config;
 
 open CONFIG, $DEFCONFIG or die 'cannot open config file';
 while (<CONFIG>) {
-       /^([\w_]+)=([ym])/ and $config{$1} = $2;
-       /^([\w_]+)=(\d+)/ and $config{$1} = $2;
-       /^([\w_]+)=(".+")/ and $config{$1} = $2;
+       /^CONFIG_([\w_]+)=([ym])/ and $config{$1} = $2;
+       /^CONFIG_([\w_]+)=(\d+)/ and $config{$1} = $2;
+       /^CONFIG_([\w_]+)=(".+")/ and $config{$1} = $2;
 }
 close CONFIG;
 
@@ -39,8 +39,8 @@ while (<FIND>) {
                next if $line =~ /^\s*mainmenu/;
 
                # FIXME: make this dynamic
-               $line =~ s/default CONFIG_FEATURE_BUFFERS_USE_MALLOC/default CONFIG_FEATURE_BUFFERS_GO_ON_STACK/;
-               $line =~ s/default BUSYBOX_CONFIG_FEATURE_SH_IS_NONE/default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH/;
+               $line =~ s/default FEATURE_BUFFERS_USE_MALLOC/default FEATURE_BUFFERS_GO_ON_STACK/;
+               $line =~ s/default FEATURE_SH_IS_NONE/default FEATURE_SH_IS_ASH/;
 
                if ($line =~ /^\s*config\s*([\w_]+)/) {
                        $cur = $1;
@@ -52,10 +52,12 @@ while (<FIND>) {
                }
                $line =~ s/^(\s*source\s+)/$1package\/busybox\/config\//;
                
-               $line =~ s/(\s+)((CONFIG|FDISK|USING|CROSS|EXTRA|PREFIX|FEATURE|HAVE|BUSYBOX)[\w_]*)/$1BUSYBOX_$2/g;
+               $line =~ s/^(\s*(prompt "[^"]+" if|config|depends|depends on|select|default|default \w if)\s+\!?)([A-Z_])/$1BUSYBOX_CONFIG_$3/g;
+               $line =~ s/(( \|\| | \&\& | \( )!?)([A-Z_])/$1BUSYBOX_CONFIG_$3/g;
+               $line =~ s/(\( ?!?)([A-Z_]+ (\|\||&&))/$1BUSYBOX_CONFIG_$2/g;
                
                if ($cur) {
-                       ($cur !~ /^CONFIG/ or $cur eq 'CONFIG_LFS') and do {
+                       ($cur eq 'LFS') and do {
                                $line =~ s/^(\s*(bool|tristate|string))\s*".+"$/$1/;
                        };
                        if ($line =~ /^\s*default/) {