dnsmasq: look for lua.pc, not lua5.1.pc

(From meta-openembedded rev: f1e112fa688aa0900ebdbcc31d88c6ce91251495)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
new file mode 100644 (file)
index 0000000..aac7b97
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -0,0 +1,16 @@
+Upstream-status: Inappropriate [OE specific]
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+
+--- dnsmasq-2.68.orig/Makefile 2014-08-11 09:05:17.000000000 -0700
++++ dnsmasq-2.68/Makefile      2014-08-11 09:05:51.930648617 -0700
+@@ -57,8 +57,8 @@
+ idn_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` 
+ ct_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
+ ct_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
+-lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` 
+-lua_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1` 
++lua_cflags =  `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua`
++lua_libs =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua`
+ sunos_libs =  `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
+ version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
+ 

diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
similarity index 100%
rename from meta-openembedded/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch

diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
index 6caa92a..61b94a0 100644 (file)
--- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
+++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
@@ -1,6 +1,9 @@
 require dnsmasq.inc
 
-SRC_URI += "file://parallel-make.patch"
+SRC_URI += "\
+    file://parallel-make.patch \
+    file://lua.patch \
+"
 
 SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef"
 SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f"