Skip to contentSkip to conversation

dnsmasq: add missing dependency on host-gettext

PATCH New Thomas Petazzoni 2 participants 2 messages Mar 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/dnsmasq/dnsmasq.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/dnsmasq/dnsmasq.mk +2 -2
index fe75e7b..285f06e 100644
@@ -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)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 dnsmasq: add missing dependency on host-gettext

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> When idn support is enabled, the dnsmasq build procedure requires Thomas> xgettext, which is provided by host-gettext.

Thomas> Moreover, dnsmasq.mk was not passing $(TARGET_MAKE_ENV) in the Thomas> environment, so $(HOST_DIR)/usr/bin was not in the PATH. For that Thomas> reason, the dnsmasq Makefile could not find the xgettext program.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard