[PATCH] fix build on nls free systems (70a6a0cb) · Commits · 戴 / test

I made a patch that detects if libintl.h (needed for nls) is present on the host system and if it's not, it nls support is disabled by providing dummies for the used nls functions. This way if there is nls support on the host system the *config targets will build according to Arnaldo Carvalho de Melo's i18n modifications, else it just uses the original English messages. I have also made a bug report at kernel's bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=5501 And there is a discussion about this problem in Gentoo's bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=99810 Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

scripts/kconfig/Makefile

+9 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,15 @@ endif
		clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
		.tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c

		# Needed for systems without gettext
		KBUILD_HAVE_NLS := $(shell \
		if echo "\#include <libint.h>" \| $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \
		then echo yes ; \
		else echo no ; fi)
		ifeq ($(KBUILD_HAVE_NLS),no)
		HOSTCFLAGS += -DKBUILD_NO_NLS
		endif

		# generated files seem to need this to find local include files
		HOSTCFLAGS_lex.zconf.o := -I$(src)
		HOSTCFLAGS_zconf.tab.o := -I$(src)

scripts/kconfig/lkc.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,13 @@

		#include "expr.h"

		#ifndef KBUILD_NO_NLS
		# include <libintl.h>
		#else
		# define gettext(Msgid) ((const char *) (Msgid))
		# define textdomain(Domainname) ((const char *) (Domainname))
		# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
		#endif

		#ifdef __cplusplus
		extern "C" {

Admin message