On Mon, Aug 11, 2014 at 09:12:21AM -0700, Christopher Larson wrote: > From: Christopher Larson <[email protected]> > > This is rebased on current master. The parallel make fix's commit message is > adjusted to match what it does, and the lua patch is fixed.. It seems > something inadvertantly trimmed trailing whitespace out of the patch, oops. > > The following changes since commit 4d4ab8fd320b58323033c12cf705e7b3ce10d659: > > integrate fcgi-2.4.0 and add OML license file (2014-08-10 17:23:22 +0100) > > are available in the git repository at:
Thanks for v2, it looks like some trailing spaces were lost in v1, so hopefully it will apply now: diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index 63dd71a..aac7b97 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -1,15 +1,16 @@ Upstream-status: Inappropriate [OE specific] Signed-off-by: Christopher Larson <[email protected]> ---- 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` +--- 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 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)`\"' + > > https://github.com/kergoth/meta-openembedded dnsmasq-fixes > > for you to fetch changes up to 2e84f59401a5ce57ba17841ff4ddb01cffeb1145: > > dnsmasq: add packageconfigs for idn, conntrack, lua (2014-08-11 09:07:14 > -0700) > > ---------------------------------------------------------------- > Christopher Larson (5): > dnsmasq: add missing inherit pkgconfig > dnsmasq: obey CFLAGS & LDFLAGS > dnsmasq: move parallel make patch to .bb, add upstream-status > dnsmasq: look for lua.pc, not lua5.1.pc > dnsmasq: add packageconfigs for idn, conntrack, lua > > meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 19 > ++++++++++++++----- > .../recipes-support/dnsmasq/dnsmasq/lua.patch | 16 ++++++++++++++++ > .../dnsmasq/{files => dnsmasq}/parallel-make.patch | 1 + > .../recipes-support/dnsmasq/dnsmasq_2.68.bb | 5 +++++ > 4 files changed, 36 insertions(+), 5 deletions(-) > create mode 100644 meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch > rename meta-networking/recipes-support/dnsmasq/{files => > dnsmasq}/parallel-make.patch (96%) > > -- > 1.8.3.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
