summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-06-24 17:13:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-25 11:49:38 +0100
commit08a136e6fd9b598fc11787752b1a0a5c53e898ec (patch)
tree7222b24606fddd8f500739ee8b2c5ba7c62b8a25
parent94368a16636b05dc21db564a0a55e0a705fbfa29 (diff)
downloadopenembedded-core-contrib-08a136e6fd9b598fc11787752b1a0a5c53e898ec.tar.gz
openembedded-core-contrib-08a136e6fd9b598fc11787752b1a0a5c53e898ec.tar.bz2
openembedded-core-contrib-08a136e6fd9b598fc11787752b1a0a5c53e898ec.zip
liburcu: Update to 0.8.4
Removed patch fixed upstream Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/liburcu/liburcu/fixsepbuild.patch19
-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 @@
-Upstream-Status: Pending
-
-Fix out of tree build for doc examples
-
-Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
-
-Index: userspace-rcu-0.8.0/doc/examples/Makefile.am
-===================================================================
---- userspace-rcu-0.8.0.orig/doc/examples/Makefile.am 2013-08-30 21:25:20.000000000 +0300
-+++ userspace-rcu-0.8.0/doc/examples/Makefile.am 2013-10-21 17:52:34.774597179 +0300
-@@ -128,7 +128,7 @@
- cp -fR $(srcdir)/$$subdir $(builddir); \
- done; \
- fi
-- $(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
-+ $(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
-
- clean-local:
- $(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 \
file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42"
SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
- file://fixsepbuild.patch"
+ "
-SRC_URI[md5sum] = "c0c0613bcce3b6954a050faa6dec6f51"
-SRC_URI[sha256sum] = "8008f697b030d7d3043ebd3a72be63cefc9242ed2d50520d30211e3908a4e01e"
+SRC_URI[md5sum] = "2ca6671b20a550aa0e8020a1a9a96fd4"
+SRC_URI[sha256sum] = "96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12"
S = "${WORKDIR}/userspace-rcu-${PV}"
CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"