diff options
| author |   Cristiana Voicu <cristiana.voicu@intel.com> | 2013-10-31 08:17:08 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:30:52 +0000 |
| commit | 4b2aa17a5c5d2ccf9824a4d2fd71f600b18ba2f2 (patch) | |
| tree | 5cdf8726b6acc230bc2747fa1c512aa7fe2f1bc7 /meta/recipes-support/liburcu | |
| parent | 60973d0584e2533f0debfcd8e80c5e29beb68e37 (diff) | |
| download | openembedded-core-contrib-4b2aa17a5c5d2ccf9824a4d2fd71f600b18ba2f2.tar.gz | |
liburcu: upgrade to 0.8.0
Fix case where ${B} != ${S}; add patch to allow out
of tree doc exemples build to work
Add patch to remove CC=gcc when CC is defined, in order to
use the cross compiler.
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/liburcu')
| -rw-r--r-- | meta/recipes-support/liburcu/files/fixCCflag.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-support/liburcu/files/fixsepbuild.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-support/liburcu/liburcu_0.8.0.bb (renamed from meta/recipes-support/liburcu/liburcu_0.7.7.bb) | 8 |
3 files changed, 44 insertions, 3 deletions
diff --git a/meta/recipes-support/liburcu/files/fixCCflag.patch b/meta/recipes-support/liburcu/files/fixCCflag.patch new file mode 100644 index 00000000000..2e526d45179 --- /dev/null +++ b/meta/recipes-support/liburcu/files/fixCCflag.patch @@ -0,0 +1,20 @@ +Upstream-Status: Pending + +Use cross compiler for doc exemples too + +Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> + +Index: userspace-rcu-0.8.0/doc/examples/Makefile.examples.template +=================================================================== +--- userspace-rcu-0.8.0.orig/doc/examples/Makefile.examples.template 2013-08-30 21:25:20.000000000 +0300 ++++ userspace-rcu-0.8.0/doc/examples/Makefile.examples.template 2013-10-23 13:34:30.405550556 +0300 +@@ -11,7 +11,9 @@ + # + # This makefile is purposefully kept simple to support GNU and BSD make. + ++ifndef CC + CC = gcc ++endif + CFLAGS = -g -O2 -Wall + + all: $(BINARY) diff --git a/meta/recipes-support/liburcu/files/fixsepbuild.patch b/meta/recipes-support/liburcu/files/fixsepbuild.patch new file mode 100644 index 00000000000..9cd0ab9e734 --- /dev/null +++ b/meta/recipes-support/liburcu/files/fixsepbuild.patch @@ -0,0 +1,19 @@ +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.7.7.bb b/meta/recipes-support/liburcu/liburcu_0.8.0.bb index a75e92ec4de..0bb4545cec7 100644 --- a/meta/recipes-support/liburcu/liburcu_0.7.7.bb +++ b/meta/recipes-support/liburcu/liburcu_0.8.0.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0f060c30a27922ce9c0d557a639b4fa3 \ file://urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \ file://urcu/uatomic/x86.h;beginline=4;endline=21;md5=220552f72c55b102f2ee35929734ef42" -SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2" +SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \ + file://fixsepbuild.patch \ + file://fixCCflag.patch" -SRC_URI[md5sum] = "d14de3ff32eb1ab9424b258599c8a6f3" -SRC_URI[sha256sum] = "8ab8a7d8fea47c09ceac24c9277f00da626bbd9426c973eb325b1baf33b4bdfb" +SRC_URI[md5sum] = "ddf193131b9f172c8f540b60d9d339f4" +SRC_URI[sha256sum] = "49fbe70af47945037f437931c9539bfb9cb03ba28b813649ea7394dbdca70658" S = "${WORKDIR}/userspace-rcu-${PV}" CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" |