浏览代码

package/lshw: don't use NONLS when BR2_SYSTEM_ENABLE_NLS is not set

Since [1], NONLS is added to LSHW_CFLAGS even for glibc based toolchain.
Previously it was not the case since BR2_ENABLE_LOCALE is always
selected for glibc based toolchain.

With NONLS, config.h try to redefine two Intl function (textdomain and
bindtextdomain) that are used by glibc internally.

This break the build with the following error:
sysroot/usr/include/libintl.h:82:52: error: expected unqualified-id before 'throw'
 extern char *textdomain (const char *__domainname) __THROW;

The NONLS mode is really for cases where the C library does not provide
*any* gettext implementation, as would be the case with uClibc without
intl stubs enabled.

But in the context of Buildroot, all C libraries provide a gettext
implementation. It might be full-featured or minimal, but it always
exists.

So, remove NONLS from CFLAGS to avoid the build issue with glibc
toolchains.

Build tested with a uClibc toolchain without locale enabled.

Fixes:
http://autobuild.buildroot.net/results/9bf/9bf5437b4348ea8077013b80a51ce05fa328247d

[1] 3acd9f845de0489071719d52d774aab48d7f9c33

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Romain Naour 8 年之前
父节点
当前提交
aac99867ce
共有 1 个文件被更改,包括 1 次插入6 次删除
  1. 1 6
      package/lshw/lshw.mk

+ 1 - 6
package/lshw/lshw.mk

@@ -9,13 +9,8 @@ LSHW_SITE = http://ezix.org/software/files
 LSHW_LICENSE = GPL-2.0
 LSHW_LICENSE = GPL-2.0
 LSHW_LICENSE_FILES = COPYING
 LSHW_LICENSE_FILES = COPYING
 
 
-LSHW_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
-LSHW_CFLAGS += -DNONLS
-endif
-
 LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
 LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
-	RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
+	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
 LSHW_MAKE_ENV = \
 LSHW_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
 	$(TARGET_MAKE_ENV) \
 	LIBS=$(TARGET_NLS_LIBS)
 	LIBS=$(TARGET_NLS_LIBS)