diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-19 23:31:30 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-31 23:05:06 +0200 |
| commit | 8276c96fc907e0a06f764ab550cf4071d2ac7901 (patch) | |
| tree | ccf908c21fbc99e285f80b880a1985b1b18b68a7 /package/grep/grep.mk | |
| parent | 281d8451c4082fb2e1f0e65c7e10aecfbe192482 (diff) | |
| download | buildroot-8276c96fc907e0a06f764ab550cf4071d2ac7901.tar.gz buildroot-8276c96fc907e0a06f764ab550cf4071d2ac7901.zip | |
grep: gettext is not mandatory
Even when locales are enabled, gettext is not mandatory to build
grep, i.e the following defconfig builds fine:
BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.02-1096-g54a5333.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
BR2_PACKAGE_GETTEXT=y
BR2_PACKAGE_GREP=y
However, if gettext provides libintl, it gets used. Therefore this
commit moves gettext from a mandatory dependency to an optional
dependency.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/grep/grep.mk')
| -rw-r--r-- | package/grep/grep.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 92a915cf1c..5101ddacf6 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -11,7 +11,11 @@ GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING GREP_CONF_OPTS = --disable-perl-regexp \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) -GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + +# Can use libintl if available +ifeq ($(BR2_PACKAGE_GETTEXT),y) +GREP_DEPENDENCIES += gettext +endif # link with iconv if enabled ifeq ($(BR2_PACKAGE_LIBICONV),y) |
