From 4b2aa17a5c5d2ccf9824a4d2fd71f600b18ba2f2 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Thu, 31 Oct 2013 08:17:08 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/liburcu/files/fixCCflag.patch | 20 ++++++++++++++++++++ meta/recipes-support/liburcu/files/fixsepbuild.patch | 19 +++++++++++++++++++ meta/recipes-support/liburcu/liburcu_0.7.7.bb | 17 ----------------- meta/recipes-support/liburcu/liburcu_0.8.0.bb | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch delete mode 100644 meta/recipes-support/liburcu/liburcu_0.7.7.bb create mode 100644 meta/recipes-support/liburcu/liburcu_0.8.0.bb (limited to 'meta/recipes-support/liburcu') diff --git a/meta/recipes-support/liburcu/files/fixCCflag.patch b/meta/recipes-support/liburcu/files/fixCCflag.patch new file mode 100644 index 0000000000..2e526d4517 --- /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 + +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 0000000000..9cd0ab9e73 --- /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 + +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.7.7.bb deleted file mode 100644 index a75e92ec4d..0000000000 --- a/meta/recipes-support/liburcu/liburcu_0.7.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "The userspace read-copy update library by Mathieu Desnoyers" -HOMEPAGE = "http://lttng.org/urcu" -BUGTRACKER = "http://lttng.org/project/issues" - -LICENSE = "LGPLv2.1+ & MIT-style" -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[md5sum] = "d14de3ff32eb1ab9424b258599c8a6f3" -SRC_URI[sha256sum] = "8ab8a7d8fea47c09ceac24c9277f00da626bbd9426c973eb325b1baf33b4bdfb" - -S = "${WORKDIR}/userspace-rcu-${PV}" -CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" -inherit autotools diff --git a/meta/recipes-support/liburcu/liburcu_0.8.0.bb b/meta/recipes-support/liburcu/liburcu_0.8.0.bb new file mode 100644 index 0000000000..0bb4545cec --- /dev/null +++ b/meta/recipes-support/liburcu/liburcu_0.8.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "The userspace read-copy update library by Mathieu Desnoyers" +HOMEPAGE = "http://lttng.org/urcu" +BUGTRACKER = "http://lttng.org/project/issues" + +LICENSE = "LGPLv2.1+ & MIT-style" +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 \ + file://fixsepbuild.patch \ + file://fixCCflag.patch" + +SRC_URI[md5sum] = "ddf193131b9f172c8f540b60d9d339f4" +SRC_URI[sha256sum] = "49fbe70af47945037f437931c9539bfb9cb03ba28b813649ea7394dbdca70658" + +S = "${WORKDIR}/userspace-rcu-${PV}" +CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE" +inherit autotools -- cgit 1.2.3-korg