diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-03-25 08:31:41 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-25 19:36:35 +0100 |
| commit | af9605d822e8712c2bd4d3cb585595c2fe6b41a6 (patch) | |
| tree | cd49f082c41a8c06dbcb1f5fbf2fc7034ff811b3 | |
| parent | fe2bcc9ea903365d9c8f86ed5785cbd9f6228899 (diff) | |
| download | buildroot-novena-af9605d822e8712c2bd4d3cb585595c2fe6b41a6.tar.gz buildroot-novena-af9605d822e8712c2bd4d3cb585595c2fe6b41a6.zip | |
dnsmasq: add missing dependency on host-gettext
When idn support is enabled, the dnsmasq build procedure requires
xgettext, which is provided by host-gettext.
Moreover, dnsmasq.mk was not passing $(TARGET_MAKE_ENV) in the
environment, so $(HOST_DIR)/usr/bin was not in the PATH. For that
reason, the dnsmasq Makefile could not find the xgettext program.
Fixes:
http://autobuild.buildroot.org/results/f7feaa818500a369a6c4c5fd8899c168f21b1460/build-end.log.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/dnsmasq/dnsmasq.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index fe75e7b78..285f06e96 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -6,7 +6,7 @@ DNSMASQ_VERSION = 2.65 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq -DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" +DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" DNSMASQ_LICENSE = Dual GPLv2/GPLv3 @@ -26,7 +26,7 @@ endif # NLS requires IDN so only enable it (i18n) when IDN is true ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) - DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) |