[OE-core] [PATCH 1/4] liburcu: upgrade to 0.8.0

[Saul Wold]

On 10/24/2013 01:01 AM, Cristiana Voicu wrote:
> 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 at intel.com>
> ---
>   meta/recipes-support/liburcu/files/fixCCflag.patch |   18 ++++++++++++++++++
>   .../liburcu/files/fixsepbuild.patch                |   18 ++++++++++++++++++
>   .../liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} |    8 +++++---
>   3 files changed, 41 insertions(+), 3 deletions(-)
>   create mode 100644 meta/recipes-support/liburcu/files/fixCCflag.patch
>   create mode 100644 meta/recipes-support/liburcu/files/fixsepbuild.patch
>   rename meta/recipes-support/liburcu/{liburcu_0.7.7.bb => liburcu_0.8.0.bb} (74%)
>
> diff --git a/meta/recipes-support/liburcu/files/fixCCflag.patch b/meta/recipes-support/liburcu/files/fixCCflag.patch
> new file mode 100644
> index 0000000..d6928c6
> --- /dev/null
> +++ b/meta/recipes-support/liburcu/files/fixCCflag.patch
> @@ -0,0 +1,18 @@
> +Use cross compiler for doc exemples too
> +
> +10/23/2013 -  created by Cristiana Voicu <cristiana.voicu at intel.com>
> +
This is kind of OK, but really should be Signed-off-by: instead

No Upstream-Status in this patch

> +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 0000000..0e2fee9
> --- /dev/null
> +++ b/meta/recipes-support/liburcu/files/fixsepbuild.patch
> @@ -0,0 +1,18 @@
> +Upstream-Status: Pending
> +
> +Fix out of tree build for doc examples
> +10/22/2013 - created by Cristiana Voicu <cristiana.voicu at intel.com>
> +
Same here really should be Signed-off-by

> +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
> similarity index 74%
> rename from meta/recipes-support/liburcu/liburcu_0.7.7.bb
> rename to meta/recipes-support/liburcu/liburcu_0.8.0.bb
> index a75e92e..0bb4545 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"
>