* [PATCH v3 1/4] kbuild: do not display CHK for filechk
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
@ 2018-05-22 7:22 ` Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 2/4] kconfig: refactor Qt package checks for building qconf Masahiro Yamada
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-22 7:22 UTC (permalink / raw)
To: linux-kbuild
Cc: Sam Ravnborg, Ulf Magnusson, Randy Dunlap, Masahiro Yamada,
Michal Marek, linux-kernel
filechk displays two short logs; CHK for creating a temporary file,
and UPD for really updating the target.
IMHO, the build system can be quiet when the target file has not
been updated.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v3: None
Changes in v2: None
scripts/Kbuild.include | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 50cee53..c7fedc5 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -57,7 +57,6 @@ kecho := $($(quiet)kecho)
# to specify a valid file as first prerequisite (often the kbuild file)
define filechk
$(Q)set -e; \
- $(kecho) ' CHK $@'; \
mkdir -p $(dir $@); \
$(filechk_$(1)) < $< > $@.tmp; \
if [ -r $@ ] && cmp -s $@ $@.tmp; then \
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 2/4] kconfig: refactor Qt package checks for building qconf
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 1/4] kbuild: do not display CHK for filechk Masahiro Yamada
@ 2018-05-22 7:22 ` Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 3/4] kconfig: refactor GTK+ package checks for building gconf Masahiro Yamada
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-22 7:22 UTC (permalink / raw)
To: linux-kbuild
Cc: Sam Ravnborg, Ulf Magnusson, Randy Dunlap, Masahiro Yamada,
linux-kernel
Currently, the necessary package checks for building qconf is
surrounded by ifeq ($(MAKECMDGOALS),xconfig) ... endif.
Then, Make will restart when .tmp_qtcheck is generated.
To simplify the Makefile, move the scripting to a separate file,
and use filechk. The shell script is executed everytime xconfig
is run, but it is not a costly script.
In the old code, 'pkg-config --exists' only checked Qt5Core / QtCore,
but the set of necessary packages should be checked.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
---
Changes in v3: None
Changes in v2: None
scripts/kconfig/Makefile | 73 +++++++++++++++++---------------------------
scripts/kconfig/qconf-cfg.sh | 25 +++++++++++++++
2 files changed, 53 insertions(+), 45 deletions(-)
create mode 100755 scripts/kconfig/qconf-cfg.sh
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 5def877..e9a87bf 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -188,8 +188,6 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
# Utilizes ncurses
# mconf: Used for the menuconfig target
# Utilizes the lxdialog package
-# qconf: Used for the xconfig target
-# Based on Qt which needs to be installed to compile it
# gconf: Used for the gconfig target
# Based on GTK+ which needs to be installed to compile it
# object files used by all kconfig flavours
@@ -201,14 +199,12 @@ conf-objs := conf.o zconf.tab.o
mconf-objs := mconf.o zconf.tab.o $(lxdialog)
nconf-objs := nconf.o zconf.tab.o nconf.gui.o
kxgettext-objs := kxgettext.o zconf.tab.o
-qconf-cxxobjs := qconf.o
-qconf-objs := zconf.tab.o
gconf-objs := gconf.o zconf.tab.o
-hostprogs-y := conf nconf mconf kxgettext qconf gconf
+hostprogs-y := conf nconf mconf kxgettext gconf
targets += zconf.lex.c
-clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
+clean-files := .tmp_gtkcheck
clean-files += gconf.glade.h
clean-files += config.pot linux.pot
@@ -228,9 +224,6 @@ HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTC
HOSTCFLAGS_zconf.lex.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src)
-HOSTLOADLIBES_qconf = $(KC_QT_LIBS)
-HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS)
-
HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-Wno-missing-prototypes
@@ -241,34 +234,22 @@ HOSTLOADLIBES_nconf = $(shell \
pkg-config --libs menuw panelw ncursesw 2>/dev/null \
|| pkg-config --libs menu panel ncurses 2>/dev/null \
|| echo "-lmenu -lpanel -lncurses" )
-$(obj)/qconf.o: $(obj)/.tmp_qtcheck
-
-ifeq ($(MAKECMDGOALS),xconfig)
-$(obj)/.tmp_qtcheck: $(src)/Makefile
--include $(obj)/.tmp_qtcheck
-
-# Qt needs some extra effort...
-$(obj)/.tmp_qtcheck:
- @set -e; $(kecho) " CHECK qt"; \
- if pkg-config --exists Qt5Core; then \
- cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets`"; \
- libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \
- moc=`pkg-config --variable=host_bins Qt5Core`/moc; \
- elif pkg-config --exists QtCore; then \
- cflags=`pkg-config --cflags QtCore QtGui`; \
- libs=`pkg-config --libs QtCore QtGui`; \
- moc=`pkg-config --variable=moc_location QtCore`; \
- else \
- echo >&2 "*"; \
- echo >&2 "* Could not find Qt via pkg-config."; \
- echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"; \
- echo >&2 "*"; \
- exit 1; \
- fi; \
- echo "KC_QT_CFLAGS=$$cflags" > $@; \
- echo "KC_QT_LIBS=$$libs" >> $@; \
- echo "KC_QT_MOC=$$moc" >> $@
-endif
+
+# qconf: Used for the xconfig target based on Qt
+hostprogs-y += qconf
+qconf-cxxobjs := qconf.o
+qconf-objs := zconf.tab.o
+
+HOSTLOADLIBES_qconf = $(shell . $(obj)/.qconf-cfg && echo $$libs)
+HOSTCXXFLAGS_qconf.o = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
+
+$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
+
+quiet_cmd_moc = MOC $@
+ cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
+
+$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
+ $(call cmd,moc)
$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
@@ -298,15 +279,17 @@ endif
$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
-$(obj)/qconf.o: $(obj)/qconf.moc
-
-quiet_cmd_moc = MOC $@
- cmd_moc = $(KC_QT_MOC) -i $< -o $@
-
-$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
- $(call cmd,moc)
-
# Extract gconf menu items for i18n support
$(obj)/gconf.glade.h: $(obj)/gconf.glade
$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
$(obj)/gconf.glade
+
+# check if necessary packages are available, and configure build flags
+define filechk_conf_cfg
+ $(CONFIG_SHELL) $<
+endef
+
+$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
+ $(call filechk,conf_cfg)
+
+clean-files += .*conf-cfg
diff --git a/scripts/kconfig/qconf-cfg.sh b/scripts/kconfig/qconf-cfg.sh
new file mode 100755
index 0000000..0862e15
--- /dev/null
+++ b/scripts/kconfig/qconf-cfg.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="Qt5Core Qt5Gui Qt5Widgets"
+PKG2="QtCore QtGui"
+
+if pkg-config --exists $PKG; then
+ echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
+ echo libs=\"$(pkg-config --libs $PKG)\"
+ echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
+ exit 0
+fi
+
+if pkg-config --exists $PKG2; then
+ echo cflags=\"$(pkg-config --cflags $PKG2)\"
+ echo libs=\"$(pkg-config --libs $PKG2)\"
+ echo moc=\"$(pkg-config --variable=moc_location QtCore)\"
+ exit 0
+fi
+
+echo >&2 "*"
+echo >&2 "* Could not find Qt via pkg-config."
+echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"
+echo >&2 "*"
+exit 1
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 3/4] kconfig: refactor GTK+ package checks for building gconf
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 1/4] kbuild: do not display CHK for filechk Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 2/4] kconfig: refactor Qt package checks for building qconf Masahiro Yamada
@ 2018-05-22 7:22 ` Masahiro Yamada
2018-05-22 7:22 ` [PATCH v3 4/4] kconfig: refactor ncurses package checks for building mconf and nconf Masahiro Yamada
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-22 7:22 UTC (permalink / raw)
To: linux-kbuild
Cc: Sam Ravnborg, Ulf Magnusson, Randy Dunlap, Masahiro Yamada,
linux-kernel
Refactor the package checks for gconf in the same way as for qconf.
Also, convert the build rule of gconf.glade.h to Kbuild style.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
---
Changes in v3:
- Use kbuild short log for building gconf.glade.h too
Changes in v2: None
scripts/kconfig/Makefile | 49 ++++++++++++--------------------------------
scripts/kconfig/gconf-cfg.sh | 23 +++++++++++++++++++++
2 files changed, 36 insertions(+), 36 deletions(-)
create mode 100755 scripts/kconfig/gconf-cfg.sh
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e9a87bf..8cee14b 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -188,8 +188,6 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
# Utilizes ncurses
# mconf: Used for the menuconfig target
# Utilizes the lxdialog package
-# gconf: Used for the gconfig target
-# Based on GTK+ which needs to be installed to compile it
# object files used by all kconfig flavours
lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
@@ -199,12 +197,10 @@ conf-objs := conf.o zconf.tab.o
mconf-objs := mconf.o zconf.tab.o $(lxdialog)
nconf-objs := nconf.o zconf.tab.o nconf.gui.o
kxgettext-objs := kxgettext.o zconf.tab.o
-gconf-objs := gconf.o zconf.tab.o
-hostprogs-y := conf nconf mconf kxgettext gconf
+hostprogs-y := conf nconf mconf kxgettext
targets += zconf.lex.c
-clean-files := .tmp_gtkcheck
clean-files += gconf.glade.h
clean-files += config.pot linux.pot
@@ -224,10 +220,6 @@ HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTC
HOSTCFLAGS_zconf.lex.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src)
-HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
-HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
- -Wno-missing-prototypes
-
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
HOSTLOADLIBES_nconf = $(shell \
@@ -251,38 +243,23 @@ quiet_cmd_moc = MOC $@
$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
$(call cmd,moc)
-$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
-
-ifeq ($(MAKECMDGOALS),gconfig)
--include $(obj)/.tmp_gtkcheck
-
-# GTK+ needs some extra effort, too...
-$(obj)/.tmp_gtkcheck:
- @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \
- if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \
- touch $@; \
- else \
- echo >&2 "*"; \
- echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \
- echo >&2 "*"; \
- false; \
- fi \
- else \
- echo >&2 "*"; \
- echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; \
- echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; \
- echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \
- echo >&2 "*"; \
- false; \
- fi
-endif
+# gconf: Used for the gconfig target based on GTK+
+hostprogs-y += gconf
+gconf-objs := gconf.o zconf.tab.o
+
+HOSTLOADLIBES_gconf = $(shell . $(obj)/.gconf-cfg && echo $$libs)
+HOSTCFLAGS_gconf.o = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
+
+$(obj)/gconf.o: $(obj)/.gconf-cfg
$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
# Extract gconf menu items for i18n support
+quiet_cmd_intl = INTL $@
+ cmd_intl = intltool-extract --type=gettext/glade --srcdir=$(srctree) $<
+
$(obj)/gconf.glade.h: $(obj)/gconf.glade
- $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
- $(obj)/gconf.glade
+ $(call cmd,intl)
# check if necessary packages are available, and configure build flags
define filechk_conf_cfg
diff --git a/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh
new file mode 100755
index 0000000..533b3d8
--- /dev/null
+++ b/scripts/kconfig/gconf-cfg.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
+
+if ! pkg-config --exists $PKG; then
+ echo >&2 "*"
+ echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
+ echo >&2 "* the GTK+ 2.0 development package is correctly installed."
+ echo >&2 "* You need $PKG"
+ echo >&2 "*"
+ exit 1
+fi
+
+if ! pkg-config --atleast-version=2.0.0 gtk+-2.0; then
+ echo >&2 "*"
+ echo >&2 "* GTK+ is present but version >= 2.0.0 is required."
+ echo >&2 "*"
+ exit 1
+fi
+
+echo cflags=\"$(pkg-config --cflags $PKG)\"
+echo libs=\"$(pkg-config --libs $PKG)\"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 4/4] kconfig: refactor ncurses package checks for building mconf and nconf
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
` (2 preceding siblings ...)
2018-05-22 7:22 ` [PATCH v3 3/4] kconfig: refactor GTK+ package checks for building gconf Masahiro Yamada
@ 2018-05-22 7:22 ` Masahiro Yamada
2018-05-22 15:36 ` Randy Dunlap
2018-05-22 15:53 ` [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Sam Ravnborg
2018-05-24 14:10 ` Masahiro Yamada
5 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-22 7:22 UTC (permalink / raw)
To: linux-kbuild
Cc: Sam Ravnborg, Ulf Magnusson, Randy Dunlap, Masahiro Yamada,
linux-kernel, Philippe Ombredanne, Greg Kroah-Hartman,
Arvind Prasanna
The mconf (or its infrastructure, lxdiaglog) depends on the ncurses.
Move and rename check-lxdialog.sh to mconf-cfg.sh to make it work in
the same way as for qconf and gconf.
This commit fixes some more weirdnesses.
The nconf also needs ncurses packages. HOSTLOADLIBES_nconf is set
to the libraries needed for nconf, but the cflags is not explicitly
set. Actually, nconf relies on the check-lxdialog.sh for the proper
cflags:
HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-DLOCALE
The code above passes the ncurses flags to all objects, even for conf,
qconf, gconf. Let's pass the ncurses flags only to mconf and nconf.
Currently, the presence of ncurses is not checked for nconf. Let's
show a prompt like the mconf case.
According to Randy's report, the shell scripts still need to carry
the fallback code in case the pkg-config fails to find the ncurses
packages.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v3:
- Squash two patches into one to not lose bisectability
Changes in v2:
- Restore fallback detection for openSUSE etc.
scripts/kconfig/Makefile | 58 ++++++++-----------
scripts/kconfig/lxdialog/check-lxdialog.sh | 93 ------------------------------
scripts/kconfig/lxdialog/dialog.h | 2 +-
scripts/kconfig/mconf-cfg.sh | 44 ++++++++++++++
scripts/kconfig/nconf-cfg.sh | 43 ++++++++++++++
5 files changed, 112 insertions(+), 128 deletions(-)
delete mode 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
create mode 100755 scripts/kconfig/mconf-cfg.sh
create mode 100644 scripts/kconfig/nconf-cfg.sh
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 8cee14b..e4ac102 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -173,59 +173,49 @@ help:
@echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support'
@echo ' tinyconfig - Configure the tiniest possible kernel'
-# lxdialog stuff
-check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
-
-# Use recursively expanded variables so we do not call gcc unless
-# we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
- -DLOCALE
-
# ===========================================================================
# Shared Makefile for the various kconfig executables:
# conf: Used for defconfig, oldconfig and related targets
-# nconf: Used for the nconfig target.
-# Utilizes ncurses
-# mconf: Used for the menuconfig target
-# Utilizes the lxdialog package
# object files used by all kconfig flavours
-lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
-lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
-
conf-objs := conf.o zconf.tab.o
-mconf-objs := mconf.o zconf.tab.o $(lxdialog)
-nconf-objs := nconf.o zconf.tab.o nconf.gui.o
kxgettext-objs := kxgettext.o zconf.tab.o
-hostprogs-y := conf nconf mconf kxgettext
+hostprogs-y := conf kxgettext
targets += zconf.lex.c
clean-files += gconf.glade.h
clean-files += config.pot linux.pot
-# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
-PHONY += $(obj)/dochecklxdialog
-$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/dochecklxdialog
-$(obj)/dochecklxdialog:
- $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
-
-always := dochecklxdialog
-
# Add environment specific flags
-HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
-HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCXX) $(HOSTCXXFLAGS))
-
+HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) \
+ -DLOCALE
+HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCXX) $(HOSTCXXFLAGS)) \
+ -DLOCALE
# generated files seem to need this to find local include files
HOSTCFLAGS_zconf.lex.o := -I$(src)
HOSTCFLAGS_zconf.tab.o := -I$(src)
-HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+# nconf: Used for the nconfig target based on ncurses
+hostprogs-y += nconf
+nconf-objs := nconf.o zconf.tab.o nconf.gui.o
+
+HOSTLOADLIBES_nconf = $(shell . $(obj)/.nconf-cfg && echo $$libs)
+HOSTCFLAGS_nconf.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
+HOSTCFLAGS_nconf.gui.o = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
+
+$(obj)/nconf.o: $(obj)/.nconf-cfg
+
+# mconf: Used for the menuconfig target based on lxdialog
+hostprogs-y += mconf
+lxdialog := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
+mconf-objs := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
+
+HOSTLOADLIBES_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
+$(foreach f, mconf.o $(lxdialog), \
+ $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
-HOSTLOADLIBES_nconf = $(shell \
- pkg-config --libs menuw panelw ncursesw 2>/dev/null \
- || pkg-config --libs menu panel ncurses 2>/dev/null \
- || echo "-lmenu -lpanel -lncurses" )
+$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/.mconf-cfg
# qconf: Used for the xconfig target based on Qt
hostprogs-y += qconf
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
deleted file mode 100755
index 6c0bcd9..0000000
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# 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 or libncurses-dev " 1>&2
- echo " *** depending on your distribution) 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
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index fcffd5b..52e30a0 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -35,7 +35,7 @@
#ifdef __sun__
#define CURS_MACROS
#endif
-#include CURSES_LOC
+#include <ncurses.h>
/*
* Colors in ncurses 1.9.9e do not work properly since foreground and
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
new file mode 100755
index 0000000..1c2fe90
--- /dev/null
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="ncursesw"
+PKG2="ncurses"
+
+if pkg-config --exists $PKG; then
+ echo cflags=\"-DNCURSES_WIDECHAR=1 $(pkg-config --cflags $PKG)\"
+ echo libs=\"$(pkg-config --libs $PKG)\"
+ exit 0
+fi
+
+if pkg-config --exists $PKG2; then
+ echo cflags=\"$(pkg-config --cflags $PKG2)\"
+ echo libs=\"$(pkg-config --libs $PKG2)\"
+ exit 0
+fi
+
+# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
+# by pkg-config.
+if [ -f /usr/include/ncursesw/ncurses.h ]; then
+ echo cflags=\"-DNCURSES_WIDECHAR=1 -I/usr/include/ncursesw\"
+ echo libs=\"-lncursesw\"
+ exit 0
+fi
+
+if [ -f /usr/include/ncurses/ncurses.h ]; then
+ echo cflags=\"-I/usr/include/ncurses\"
+ echo libs=\"-lncurses\"
+ exit 0
+fi
+
+if [ -f /usr/include/ncurses.h ]; then
+ echo cflags=\"\"
+ echo libs=\"-lncurses\"
+ exit 0
+fi
+
+echo >&2 "*"
+echo >&2 "* Unable to find the ncurses package."
+echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"
+echo >&2 "* depending on your distribution)."
+echo >&2 "*"
+exit 1
diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh
new file mode 100644
index 0000000..4c95b4e
--- /dev/null
+++ b/scripts/kconfig/nconf-cfg.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="ncursesw menuw panelw"
+PKG2="ncurses menu panel"
+
+if pkg-config --exists $PKG; then
+ echo cflags=\"-DNCURSES_WIDECHAR=1 $(pkg-config --cflags $PKG)\"
+ echo libs=\"$(pkg-config --libs $PKG)\"
+ exit 0
+fi
+
+if pkg-config --exists $PKG2; then
+ echo cflags=\"$(pkg-config --cflags $PKG2)\"
+ echo libs=\"$(pkg-config --libs $PKG2)\"
+ exit 0
+fi
+
+# Unfortunately, some distributions (e.g. openSUSE) cannot find ncurses
+# by pkg-config.
+if [ -f /usr/include/ncursesw/ncurses.h ]; then
+ echo cflags=\"-DNCURSES_WIDECHAR=1 -I/usr/include/ncursesw\"
+ echo libs=\"-lncursesw -lmenuw -lpanelw\"
+ exit 0
+fi
+
+if [ -f /usr/include/ncurses/ncurses.h ]; then
+ echo cflags=\"-I/usr/include/ncurses\"
+ echo libs=\"-lncurses -lmenu -lpanel\"
+ exit 0
+fi
+
+if [ -f /usr/include/ncurses.h ]; then
+ echo libs=\"-lncurses -lmenu -lpanel\"
+ exit 0
+fi
+
+echo >&2 "*"
+echo >&2 "* Unable to find the ncurses package."
+echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"
+echo >&2 "* depending on your distribution)."
+echo >&2 "*"
+exit 1
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v3 4/4] kconfig: refactor ncurses package checks for building mconf and nconf
2018-05-22 7:22 ` [PATCH v3 4/4] kconfig: refactor ncurses package checks for building mconf and nconf Masahiro Yamada
@ 2018-05-22 15:36 ` Randy Dunlap
0 siblings, 0 replies; 8+ messages in thread
From: Randy Dunlap @ 2018-05-22 15:36 UTC (permalink / raw)
To: Masahiro Yamada, linux-kbuild
Cc: Sam Ravnborg, Ulf Magnusson, linux-kernel, Philippe Ombredanne,
Greg Kroah-Hartman, Arvind Prasanna
On 05/22/2018 12:22 AM, Masahiro Yamada wrote:
> The mconf (or its infrastructure, lxdiaglog) depends on the ncurses.
> Move and rename check-lxdialog.sh to mconf-cfg.sh to make it work in
> the same way as for qconf and gconf.
>
> This commit fixes some more weirdnesses.
>
> The nconf also needs ncurses packages. HOSTLOADLIBES_nconf is set
> to the libraries needed for nconf, but the cflags is not explicitly
> set. Actually, nconf relies on the check-lxdialog.sh for the proper
> cflags:
>
> HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
> -DLOCALE
>
> The code above passes the ncurses flags to all objects, even for conf,
> qconf, gconf. Let's pass the ncurses flags only to mconf and nconf.
>
> Currently, the presence of ncurses is not checked for nconf. Let's
> show a prompt like the mconf case.
>
> According to Randy's report, the shell scripts still need to carry
> the fallback code in case the pkg-config fails to find the ncurses
> packages.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Thanks.
> ---
>
> Changes in v3:
> - Squash two patches into one to not lose bisectability
>
> Changes in v2:
> - Restore fallback detection for openSUSE etc.
>
> scripts/kconfig/Makefile | 58 ++++++++-----------
> scripts/kconfig/lxdialog/check-lxdialog.sh | 93 ------------------------------
> scripts/kconfig/lxdialog/dialog.h | 2 +-
> scripts/kconfig/mconf-cfg.sh | 44 ++++++++++++++
> scripts/kconfig/nconf-cfg.sh | 43 ++++++++++++++
> 5 files changed, 112 insertions(+), 128 deletions(-)
> delete mode 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
> create mode 100755 scripts/kconfig/mconf-cfg.sh
> create mode 100644 scripts/kconfig/nconf-cfg.sh
--
~Randy
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
` (3 preceding siblings ...)
2018-05-22 7:22 ` [PATCH v3 4/4] kconfig: refactor ncurses package checks for building mconf and nconf Masahiro Yamada
@ 2018-05-22 15:53 ` Sam Ravnborg
2018-05-24 14:10 ` Masahiro Yamada
5 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2018-05-22 15:53 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, Ulf Magnusson, Randy Dunlap, linux-kernel,
Philippe Ombredanne, Michal Marek, Greg Kroah-Hartman,
Arvind Prasanna
Hi Masahiro.
On Tue, May 22, 2018 at 04:22:17PM +0900, Masahiro Yamada wrote:
>
> Kconfig supports 4 GUI frontends.
> Each of them needs some support packages, but checks them differently:
>
> qconf, gconf: check packages in Makefile (pkg-config is required)
> mconf: lxdialog/check-lxdialog.sh
> nconf: needs ncurses, but its presence is not checked
>
> This series refactor the package checks so that all of them work
> in the same way.
>
> The package check scripts have been moved to scripts/kconfig/*conf-cfg.sh
>
> The motivation of this clean-up is Randy's following patch:
> https://patchwork.kernel.org/patch/10277723/
>
> I want to clean up existing code before adding more checks.
All patches in the series reviewed - fine.
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Sam
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends
2018-05-22 7:22 [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Masahiro Yamada
` (4 preceding siblings ...)
2018-05-22 15:53 ` [PATCH v3 0/4] kconfig: refactor package checks for GUI frontends Sam Ravnborg
@ 2018-05-24 14:10 ` Masahiro Yamada
5 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-05-24 14:10 UTC (permalink / raw)
To: Linux Kbuild mailing list
Cc: Sam Ravnborg, Ulf Magnusson, Randy Dunlap, Masahiro Yamada,
Linux Kernel Mailing List, Philippe Ombredanne, Michal Marek,
Greg Kroah-Hartman, Arvind Prasanna
2018-05-22 16:22 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
>
> Kconfig supports 4 GUI frontends.
> Each of them needs some support packages, but checks them differently:
>
> qconf, gconf: check packages in Makefile (pkg-config is required)
> mconf: lxdialog/check-lxdialog.sh
> nconf: needs ncurses, but its presence is not checked
>
> This series refactor the package checks so that all of them work
> in the same way.
>
> The package check scripts have been moved to scripts/kconfig/*conf-cfg.sh
>
> The motivation of this clean-up is Randy's following patch:
> https://patchwork.kernel.org/patch/10277723/
>
> I want to clean up existing code before adding more checks.
>
>
> Masahiro Yamada (4):
> kbuild: do not display CHK for filechk
> kconfig: refactor Qt package checks for building qconf
> kconfig: refactor GTK+ package checks for building gconf
> kconfig: refactor ncurses package checks for building mconf and nconf
Applied to linux-kbuild/kconfig.
> scripts/Kbuild.include | 1 -
> scripts/kconfig/Makefile | 168 ++++++++++-------------------
> scripts/kconfig/gconf-cfg.sh | 23 ++++
> scripts/kconfig/lxdialog/check-lxdialog.sh | 93 ----------------
> scripts/kconfig/lxdialog/dialog.h | 2 +-
> scripts/kconfig/mconf-cfg.sh | 44 ++++++++
> scripts/kconfig/nconf-cfg.sh | 43 ++++++++
> scripts/kconfig/qconf-cfg.sh | 25 +++++
> 8 files changed, 195 insertions(+), 204 deletions(-)
> create mode 100755 scripts/kconfig/gconf-cfg.sh
> delete mode 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
> create mode 100755 scripts/kconfig/mconf-cfg.sh
> create mode 100644 scripts/kconfig/nconf-cfg.sh
> create mode 100755 scripts/kconfig/qconf-cfg.sh
>
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread