diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-06-24 17:13:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-25 13:51:46 +0100 |
commit | 9624793f858e832e8e37418a391b0328c89c3ced (patch) | |
tree | 3125271f9f50a8b6b4222f032483608cee7aba4c /meta | |
parent | c23e597532d4ca7175a0485d59f190f7f22bc692 (diff) | |
download | poky-9624793f858e832e8e37418a391b0328c89c3ced.tar.gz |
liburcu: Update to 0.8.4
Removed patch fixed upstream
(From OE-Core rev: 08a136e6fd9b598fc11787752b1a0a5c53e898ec)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/liburcu/liburcu/fixsepbuild.patch | 19 | ||||
-rw-r--r-- | meta/recipes-support/liburcu/liburcu_0.8.4.bb (renamed from meta/recipes-support/liburcu/liburcu_0.8.1.bb) | 6 |
2 files changed, 3 insertions, 22 deletions
diff --git a/meta/recipes-support/liburcu/liburcu/fixsepbuild.patch b/meta/recipes-support/liburcu/liburcu/fixsepbuild.patch deleted file mode 100644 index 9cd0ab9e73..0000000000 --- a/meta/recipes-support/liburcu/liburcu/fixsepbuild.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix out of tree build for doc examples | ||
4 | |||
5 | Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> | ||
6 | |||
7 | Index: userspace-rcu-0.8.0/doc/examples/Makefile.am | ||
8 | =================================================================== | ||
9 | --- userspace-rcu-0.8.0.orig/doc/examples/Makefile.am 2013-08-30 21:25:20.000000000 +0300 | ||
10 | +++ userspace-rcu-0.8.0/doc/examples/Makefile.am 2013-10-21 17:52:34.774597179 +0300 | ||
11 | @@ -128,7 +128,7 @@ | ||
12 | cp -fR $(srcdir)/$$subdir $(builddir); \ | ||
13 | done; \ | ||
14 | fi | ||
15 | - $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all | ||
16 | + $(MAKE) -f dist-files/Makefile AM_CPPFLAGS="$(CPPFLAGS) -I$(top_srcdir) -I../../../urcu/ -I../../../" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath="$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all | ||
17 | |||
18 | clean-local: | ||
19 | $(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean | ||
diff --git a/meta/recipes-support/liburcu/liburcu_0.8.1.bb b/meta/recipes-support/liburcu/liburcu_0.8.4.bb index a9e7b2c899..cd7af24baa 100644 --- a/meta/recipes-support/liburcu/liburcu_0.8.1.bb +++ b/meta/recipes-support/liburcu/liburcu_0.8.4.bb | |||
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ | |||
8 | file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" | 8 | file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" |
9 | 9 | ||
10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ | 10 | SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ |
11 | file://fixsepbuild.patch" | 11 | " |
12 | 12 | ||
13 | SRC_URI[md5sum] = "c0c0613bcce3b6954a050faa6dec6f51" | 13 | SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4" |
14 | SRC_URI[sha256sum] = "8008f697b030d7d3043ebd3a72be63cefc9242ed2d50520d30211e3908a4e01e" | 14 | SRC_URI[sha256sum] = "96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12" |
15 | 15 | ||
16 | S = "${WORKDIR}/userspace-rcu-${PV}" | 16 | S = "${WORKDIR}/userspace-rcu-${PV}" |
17 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" | 17 | CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" |