NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: add missing dependency on host-gettext

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2013-03-25 08:31:41 +00:00 committed by Peter Korsgaard
parent fe2bcc9ea9
commit af9605d822
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/dnsmasq/dnsmasq.mk
View File

@ -6,7 +6,7 @@
DNSMASQ_VERSION = 2.65 DNSMASQ_VERSION = 2.65
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq 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 = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
DNSMASQ_LICENSE = Dual GPLv2/GPLv3 DNSMASQ_LICENSE = Dual GPLv2/GPLv3
@ -26,7 +26,7 @@ endif
# NLS requires IDN so only enable it (i18n) when IDN is true # NLS requires IDN so only enable it (i18n) when IDN is true
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) 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_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_COPTS += -DHAVE_IDN
DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)