From f1e112fa688aa0900ebdbcc31d88c6ce91251495 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 11 Aug 2014 09:12:25 -0700 Subject: dnsmasq: look for lua.pc, not lua5.1.pc Signed-off-by: Christopher Larson Signed-off-by: Martin Jansa --- .../recipes-support/dnsmasq/dnsmasq/lua.patch | 16 ++++++++++++++++ .../dnsmasq/dnsmasq/parallel-make.patch | 19 +++++++++++++++++++ .../recipes-support/dnsmasq/dnsmasq_2.68.bb | 5 ++++- .../recipes-support/dnsmasq/files/parallel-make.patch | 19 ------------------- 4 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch delete mode 100644 meta-networking/recipes-support/dnsmasq/files/parallel-make.patch (limited to 'meta-networking') 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 0000000000..aac7b97a16 --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -0,0 +1,16 @@ +Upstream-status: Inappropriate [OE specific] +Signed-off-by: Christopher Larson + +--- 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-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch new file mode 100644 index 0000000000..6d5b722eab --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/parallel-make.patch @@ -0,0 +1,19 @@ +The dnsmasq target depends on .configured and $(objs). .configured does an rm +-f *.o. Yet the only thing telling make to build the .configured target before +the $(objs) target was the order of the dependencies of the dnsmasq target. We +can't rely on that order when doing a paralllel make build, so add an explicit +rule to enforce that order. + +Signed-off-by: Christopher Larson +Upstream-status: Pending + +--- dnsmasq-2.68.orig/Makefile ++++ dnsmasq-2.68/Makefile +@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin + @rm -f *.o + @touch $@ + ++$(objs): .configured ++ + $(objs:.o=.c) $(hdrs): + ln -s $(top)/$(SRC)/$@ . diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb index 6caa92a923..61b94a0731 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" diff --git a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch deleted file mode 100644 index 6d5b722eab..0000000000 --- a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch +++ /dev/null @@ -1,19 +0,0 @@ -The dnsmasq target depends on .configured and $(objs). .configured does an rm --f *.o. Yet the only thing telling make to build the .configured target before -the $(objs) target was the order of the dependencies of the dnsmasq target. We -can't rely on that order when doing a paralllel make build, so add an explicit -rule to enforce that order. - -Signed-off-by: Christopher Larson -Upstream-status: Pending - ---- dnsmasq-2.68.orig/Makefile -+++ dnsmasq-2.68/Makefile -@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin - @rm -f *.o - @touch $@ - -+$(objs): .configured -+ - $(objs:.o=.c) $(hdrs): - ln -s $(top)/$(SRC)/$@ . -- cgit 1.2.3-korg