diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2014-08-04 09:07:34 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-10 16:07:17 +0200 |
| commit | 6576cddf6b66c34e9ea550d8dd0819c559237b5a (patch) | |
| tree | 61fb10fe9fa2ea601ade2d9529023ece0629a497 /meta-oe/recipes-support/libusbg | |
| parent | 2d2e49e79318889268f6e3293c2127c13be5cd6b (diff) | |
| download | meta-openembedded-contrib-6576cddf6b66c34e9ea550d8dd0819c559237b5a.tar.gz | |
libusbg: update to latest git and fix S!=B
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libusbg')
| -rw-r--r-- | meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch | 39 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libusbg/libusbg_git.bb | 8 |
2 files changed, 43 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch new file mode 100644 index 0000000000..6be49fbca4 --- /dev/null +++ b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch @@ -0,0 +1,39 @@ +From 6118c6ec1291a5c731aa8d4f0c1eb8cce43d47ad Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 4 Aug 2014 09:04:08 +0200 +Subject: [PATCH] Fix out-of-tree builds + +The include flag should point to the source directory, not the build +directory. + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +Upstream-status: Submitted [https://github.com/libusbg/libusbg/pull/9] +--- + examples/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index f9f9407..ef4f81e 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + bin_PROGRAMS = show-gadgets gadget-acm-ecm + gadget_acm_ecm_SOURCES = gadget-acm-ecm.c + show_gadgets_SOURCES = show-gadgets.c +-AM_CPPFLAGS=-I../include/ ++AM_CPPFLAGS=-I$(top_srcdir)/include/ + AM_LDFLAGS=-L../src/ -lusbg +diff --git a/src/Makefile.am b/src/Makefile.am +index d955a4c..2f71366 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,4 @@ + lib_LTLIBRARIES = libusbg.la + libusbg_la_SOURCES = usbg.c + libusbg_la_LDFLAGS = -version-info 0:1:0 +-AM_CPPFLAGS=-I../include/ ++AM_CPPFLAGS=-I$(top_srcdir)/include/ +-- +1.9.0 + diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb index 280983b1fa..97d60a6a8a 100644 --- a/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit autotools -PNBLACKLIST[libusbg] = "BROKEN: Doesn't work with B!=S and nobody sent patch to fix it" - PV = "0.1.0" -SRCREV = "7e2b04363f319e8936a606bdb122dbde249a2f58" -SRC_URI = "git://github.com/libusbg/libusbg.git" +SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" +SRC_URI = "git://github.com/libusbg/libusbg.git \ + file://0001-Fix-out-of-tree-builds.patch \ + " S = "${WORKDIR}/git" |