aboutsummaryrefslogtreecommitdiff
path: root/scripts/kconfig/lxdialog (follow)
Commit message (Collapse)AuthorAgeFilesLines
* kconfig/lxdialog: get ncurses CFLAGS with pkg-configBjørn Forsman2016-04-031-1/+5
| | | | | | | | | | | | | This makes "make menuconfig" also work on systems where ncurses is not installed in a standard location (such as on NixOS). This patch changes ccflags() so that it tries pkg-config first, and only if pkg-config fails does it go back to the fallback/manual checks. This is the same algorithm that ldflags() already uses. Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kbuild: Make scripts executableMichal Marek2016-04-031-0/+0
| | | | | | | | The Makefiles call the respective interpreter explicitly, but this makes it easier to use the scripts manually. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kconfig/lxdialog: rationalise the include paths where to find {.n}curses{,w}.hYann E. MORIN2016-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code does this: if [ -f /usr/include/ncursesw/curses.h ]; then echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"' 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="<ncurses/curses.h>"' [...] This is merely inconsistent: - adding the full path to the directory in the -I directive, - especially since that path is already a sub-path of the system include path, - and then repeating the sub-path in the #include directive. Rationalise each include directive: - only use the filename in the #include directive, - keep the -I directives: they are always searched for before the system include path; this ensures the correct header is used. Using the -I directives and the filename-only in #include is more in line with how pkg-config behaves, eg.: $ pkg-config --cflags ncursesw -I/usr/include/ncursesw This paves the way for using pkg-config for CFLAGS, too, now we use it to find the libraries. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* menuconfig: optionally use pkg-config to detect ncurses libsJustin Lecher2016-04-031-0/+2
| | | | | | | | | | | | | | | When building ncurses with --with-termlib several symbols get moved from libncurses.so to libtinfo.so. Thus when linking with libncurses.so, one additionally needs to link with libtinfo.so. The ncurses pkg-config module will be used to detect the necessary libs for linking. If not available the old heuristic for detection of the ncurses libs will be used. Signed-off-by: Justin Lecher <jlec@gentoo.org> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* menuconfig: fix extended colors ncurses supportKrzysztof Mazur2016-04-031-0/+1
| | | | | | | | | | | | | | | | | | The ncurses library allows for extended colors. The support for extended colors support depends on wide-character support. ncurses headers enable extended colors (NCURSES_EXT_COLORS) only when wide-character support is enabled (NCURSES_WIDECHAR). The "make menuconfig" uses wide-character ncursesw library, which can be compiled with wide-character support, but does not define NCURSES_WIDECHAR and it's using headers without wide-character (and extended colors) support. This fixes problems with colors on systems with enabled extended colors (like PLD Linux). Without this patch "make menuconfig" is hard to use. Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kbuild: Fix gcc -x syntaxJean Delvare2016-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The correct syntax for gcc -x is "gcc -x assembler", not "gcc -xassembler". Even though the latter happens to work, the former is what is documented in the manual page and thus what gcc wrappers such as icecream do expect. This isn't a cosmetic change. The missing space prevents icecream from recognizing compilation tasks it can't handle, leading to silent kernel miscompilations. Besides me, credits go to Michael Matz and Dirk Mueller for investigating the miscompilation issue and tracking it down to this incorrect -x parameter syntax. Signed-off-by: Jean Delvare <jdelvare@suse.de> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: stable@vger.kernel.org Cc: Bernhard Walle <bernhard@bwalle.de> Cc: Michal Marek <mmarek@suse.cz> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kconfig: fix check-lxdialog for DLL platformsYaakov Selkowitz2016-04-031-1/+1
| | | | | | | | | | Import libraries on Cygwin and MinGW/MSYS use the .dll.a suffix, so checking this suffix is necessary to make sure ncurses will still be found when built without static libraries. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kconfig: check ncursesw headers first in check-lxdialogYaakov Selkowitz2016-04-031-3/+3
| | | | | | | | | | | | Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for ncursesw/curses.h for the case where ncurses and ncursesw are build separately but only one is installed. But if both are installed, the headers ncurses/curses.h and ncursesw/curses.h differ, and since libncursesw will be found first, so should ncursesw/curses.h. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* kconfig: fix menuconfig on debian lennyJunio C Hamano2016-04-031-0/+2
| | | | | | | | | | | | | | | | | In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15), support to link menuconfig with ncursesw library was added. To compute the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow ncursesw to be used as a replacement ncurses. However, when checking what header file to include, we do not check /usr/include/ncursesw directory. Add /usr/include/ncursesw to the list of directories that are checked. With this patch, on my Debian Lenny box with libncursesw5-dev package but not libncurses5-dev package, I can say "make menuconfig". Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* Revert "lxdialog: fix ncursesw include detection"Mike Frysinger2016-04-031-5/+1
| | | | | | | | | This reverts commit e91bc53d0c2e8de7dc4fbdb888ab0a4923c2b475. Let's get back to a state that matches upstream so we can pull in all of their fixes from the last few years. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* get rid of several "variable 'x' set but not used" warningsCristian Ionescu-Idbohrn2011-05-011-5/+3
| | | | | Signed-off-by: Cristian Ionescu-Idbohrn <cii@axis.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* check-lxdialog.sh: fix helptextBernhard Reutner-Fischer2010-06-111-1/+1
| | | | Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
* lxdialog: fix ncursesw include detectionBernhard Reutner-Fischer2010-05-211-1/+5
| | | | | | | the lib was checked but the include not, do so. TODO: check if upstream fixed that already or fix it there, too. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
* add .gitignore filesMike Frysinger2009-05-051-0/+4
| | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* - forgot to pass in the HOST_EXTRACFLAGSBernhard Reutner-Fischer2008-08-282-4/+2
|
* - pull check-lxdialog from linux-2.6.26Bernhard Reutner-Fischer2008-08-271-23/+21
|
* Remove 'busybox' word from configuration programsDenis Vlasenko2008-05-281-3/+3
| | | | | (based on experience of adapting it to uclibc).
* check-lxdialog.sh: no point in giving up, maybe -lcurses will work?Denis Vlasenko2007-09-261-1/+3
|
* dont use obsolete function index() as pointed out by src.obsolete.funcsMike Frysinger2007-03-171-2/+2
|
* whitespace fixes (leading spaces to tab)Denis Vlasenko2007-01-131-2/+2
|
* Trailing whitespace removal over entire treeDenis Vlasenko2007-01-112-2/+2
|
* "kernel config" -> "busybox config"Denis Vlasenko2006-11-301-1/+1
| | | | suggested by Roberto A. Foglietta <roberto.foglietta@gmail.com>
* build system overhaulDenis Vlasenko2006-10-0513-0/+2695
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 05:08:25 +0000