mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-19 11:18:28 +00:00
9b5f0b1da9
Update the files under scripts/kconfig/ to match Linux 4.1.
Some Kconfig sources have diverged from those in the kernel,
so commit-base syncing was done not to lose U-Boot specific updates.
The commits cherry-picked from Linux are:
[1] commit be8af2d54a66911693eddc556e4f7a866670082b
Author: Bjørn Forsman <bjorn.forsman@gmail.com>
kconfig/lxdialog: get ncurses CFLAGS with pkg-config
[2] commit 3943f42c11896ce82ad3da132c8a5630313bdd0e
Author: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Replace mentions of "list_struct" to "list_head"
[3] commit e4e458b45c5861808674eebfea94cee2258bb2ea
Author: Arjun Sreedharan <arjun024@gmail.com>
calloc/xcalloc: Fix argument order
[4] commit 09950bc256e3628d275f90e016e6f5a039fbdcab
Author: Olof Johansson <olof@lixom.net>
merge_config.sh: Display usage if given too few arguments
[5] commit b6a2ab2cd4739a9573ed41677e53171987b8da34
Author: Colin Ian King <colin.king@canonical.com>
kconfig: use va_end to match corresponding va_start
[6] commit 70529b1a1784503169416df19ce3d68746401340
Author: Michal Marek <mmarek@suse.cz>
kconfig: Get rid of the P() macro in headers
[7] commit 463157444e377bf9b279101b1f16a94c4648c03a
Author: Michal Marek <mmarek@suse.cz>
kconfig: Remove dead code
[8] commit ad8d40cda3ad22ad9e8863d55a5c88f85c0173f0
Author: Michal Marek <mmarek@suse.cz>
kconfig: Remove unnecessary prototypes from headers
[9] commit de4619937229378e81f95e99c9866acc8e207d34
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
kbuild: mergeconfig: fix "jobserver unavailable" warning
[10] commit b9fe99c5b994c6ddc57780993966b18899526c0b
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
kbuild: mergeconfig: move an error check to merge_config.sh
[11] commit 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
kbuild: mergeconfig: remove redundant $(objtree)
[12] commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
merge_config.sh: improve indentation
[13] commit bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
merge_config.sh: rename MAKE to RUNMAKE
[14] commit 63a91033d52e64a22e571fe84924c0b7f21c280d
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
kbuild: add generic mergeconfig target, %.config
[15] commit 1cba0c305758c3c1786ecaceb03e142c95a4edc9
Author: Michal Marek <mmarek@suse.cz>
kconfig: Simplify Makefile
[16] commit 0a1f00a1c86421cc07cec87011c7cf4df68ee54b
Author: Michal Marek <mmarek@suse.cz>
kconfig: Do not print status messages in make -s mode
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
91 lines
2 KiB
Bash
Executable file
91 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
# Check ncurses compatibility
|
|
|
|
# What library to link
|
|
ldflags()
|
|
{
|
|
pkg-config --libs ncursesw 2>/dev/null && exit
|
|
pkg-config --libs ncurses 2>/dev/null && exit
|
|
for ext in so a dll.a dylib ; do
|
|
for lib in ncursesw ncurses curses ; do
|
|
$cc -print-file-name=lib${lib}.${ext} | grep -q /
|
|
if [ $? -eq 0 ]; then
|
|
echo "-l${lib}"
|
|
exit
|
|
fi
|
|
done
|
|
done
|
|
exit 1
|
|
}
|
|
|
|
# Where is ncurses.h?
|
|
ccflags()
|
|
{
|
|
if pkg-config --cflags ncursesw 2>/dev/null; then
|
|
echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
|
|
elif pkg-config --cflags ncurses 2>/dev/null; then
|
|
echo '-DCURSES_LOC="<ncurses.h>"'
|
|
elif [ -f /usr/include/ncursesw/curses.h ]; then
|
|
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
|
|
echo ' -DNCURSES_WIDECHAR=1'
|
|
elif [ -f /usr/include/ncurses/ncurses.h ]; then
|
|
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
|
|
elif [ -f /usr/include/ncurses/curses.h ]; then
|
|
echo '-I/usr/include/ncurses -DCURSES_LOC="<curses.h>"'
|
|
elif [ -f /usr/include/ncurses.h ]; then
|
|
echo '-DCURSES_LOC="<ncurses.h>"'
|
|
else
|
|
echo '-DCURSES_LOC="<curses.h>"'
|
|
fi
|
|
}
|
|
|
|
# Temp file, try to clean up after us
|
|
tmp=.lxdialog.tmp
|
|
trap "rm -f $tmp" 0 1 2 3 15
|
|
|
|
# Check if we can link to ncurses
|
|
check() {
|
|
$cc -x c - -o $tmp 2>/dev/null <<'EOF'
|
|
#include CURSES_LOC
|
|
main() {}
|
|
EOF
|
|
if [ $? != 0 ]; then
|
|
echo " *** Unable to find the ncurses libraries or the" 1>&2
|
|
echo " *** required header files." 1>&2
|
|
echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
|
|
echo " *** " 1>&2
|
|
echo " *** Install ncurses (ncurses-devel) and try again." 1>&2
|
|
echo " *** " 1>&2
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
usage() {
|
|
printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
|
|
}
|
|
|
|
if [ $# -eq 0 ]; then
|
|
usage
|
|
exit 1
|
|
fi
|
|
|
|
cc=""
|
|
case "$1" in
|
|
"-check")
|
|
shift
|
|
cc="$@"
|
|
check
|
|
;;
|
|
"-ccflags")
|
|
ccflags
|
|
;;
|
|
"-ldflags")
|
|
shift
|
|
cc="$@"
|
|
ldflags
|
|
;;
|
|
"*")
|
|
usage
|
|
exit 1
|
|
;;
|
|
esac
|