[oe-commits] Christopher Larson : dnsmasq: look for lua.pc, not lua5.1.pc

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 64e3722def66171c5f7998f244f6abe87703743c
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=64e3722def66171c5f7998f244f6abe87703743c

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Sat Aug  9 18:01:14 2014 -0700

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

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/lua.patch | 15 +++++++++++++++
 .../dnsmasq/{files => dnsmasq}/parallel-make.patch        |  0
 meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb   |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
new file mode 100644
index 0000000..63dd71a
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
@@ -0,0 +1,15 @@
+Upstream-status: Inappropriate [OE specific]
+Signed-off-by: Christopher Larson <chris_larson at mentor.com>
+
+--- dnsmasq-2.68.orig/Makefile
++++ dnsmasq-2.68/Makefile
+@@ -57,8 +57,8 @@ idn_cflags =  `echo $(COPTS) | $(top)/bl
+ 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-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
similarity index 100%
rename from meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
rename to meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
index 6caa92a..61b94a0 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
+++ b/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"