[oe-commits] Christopher Larson : dnsmasq: add packageconfigs for idn, conntrack, lua
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 12 11:40:45 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: b758f4a0de7a681ad1f6db6e23adaf6e4fca4895
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b758f4a0de7a681ad1f6db6e23adaf6e4fca4895
Author: Christopher Larson <chris_larson at mentor.com>
Date: Mon Aug 11 09:12:26 2014 -0700
dnsmasq: add packageconfigs for idn, conntrack, lua
Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 92c5367..1335245 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -18,10 +18,16 @@ inherit pkgconfig update-rc.d systemd
INITSCRIPT_NAME = "dnsmasq"
INITSCRIPT_PARAMS = "defaults"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus"
-EXTRA_OEMAKE = "${EXTRA_OECONF}"
-EXTRA_OEMAKE += "\
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[dbus] = ",,dbus"
+PACKAGECONFIG[idn] = ",,libidn"
+PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack"
+PACKAGECONFIG[lua] = ",,lua"
+EXTRA_OEMAKE = "\
+ 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \
+ ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \
+ ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \
+ ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
More information about the Openembedded-commits
mailing list