summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-19 23:04:40 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-05-31 23:04:30 +0200
commite613c6eb4a79b0c4e79d099e12c35e27370ecb60 (patch)
tree083193528af64ad423a78c448c71b05c937a24a6
parent3a51b42a24fc61ea637516b914d9c578be249103 (diff)
downloadbuildroot-e613c6eb4a79b0c4e79d099e12c35e27370ecb60.tar.gz
buildroot-e613c6eb4a79b0c4e79d099e12c35e27370ecb60.zip
fetchmail: gettext is not mandatory
Even when locales are enabled, gettext is not mandatory to build fetchmail, 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_FETCHMAIL=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>
-rw-r--r--package/fetchmail/Config.in1
-rw-r--r--package/fetchmail/fetchmail.mk8
2 files changed, 6 insertions, 3 deletions
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
index 1e829a0512..7c14176b23 100644
--- a/package/fetchmail/Config.in
+++ b/package/fetchmail/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FETCHMAIL
select BR2_PACKAGE_CA_CERTIFICATES
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
Fetchmail - the mail-retrieval daemon
Client daemon to move mail from POP and IMAP to your local computer
diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk
index 2c3786f8e7..49ce0d3a80 100644
--- a/package/fetchmail/fetchmail.mk
+++ b/package/fetchmail/fetchmail.mk
@@ -20,8 +20,12 @@ FETCHMAIL_CONF_OPTS = \
FETCHMAIL_DEPENDENCIES = \
ca-certificates \
- openssl \
- $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+ openssl
+
+# libintl is an optional dependency
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+FETCHMAIL_DEPENDENCIES += gettext
+endif
# fetchmailconf.py script is not (yet) python3-compliant.
# Prevent the pyc-compilation with python-3 from failing by removing this
OpenPOWER on IntegriCloud