Patchwork [03/10] liburcu: Update to 0.8.4

login
register
mail settings
Submitter Saul Wold
Date June 25, 2014, 12:13 a.m.
Message ID <06c0930e320d25880f1fab734179e949b1ffce46.1403654908.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/74325/
State New
Headers show

Comments

Saul Wold - June 25, 2014, 12:13 a.m.
Removed patch fixed upstream

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../recipes-support/liburcu/liburcu/fixsepbuild.patch | 19 -------------------
 .../liburcu/{liburcu_0.8.1.bb => liburcu_0.8.4.bb}    |  6 +++---
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 meta/recipes-support/liburcu/liburcu/fixsepbuild.patch
 rename meta/recipes-support/liburcu/{liburcu_0.8.1.bb => liburcu_0.8.4.bb} (77%)
Enrico Scholz - June 27, 2014, 9:56 a.m.
Saul Wold <sgw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> writes:

> rename from meta/recipes-support/liburcu/liburcu_0.8.1.bb
> rename to meta/recipes-support/liburcu/liburcu_0.8.4.bb

With this version, build fails always with

| liburcu/0.8.4-r0/userspace-rcu-0.8.4/urcu/compiler.h:125:5: error: #error Your gcc version produces clobbered frame accesses
|  #   error Your gcc version produces clobbered frame accesses
| make[2]: *** [wfqueue.lo] Error 1

This new package seems to blacklist[1] gcc-4.8.0 till gcc-4.8.2 which is
used by OE.



Enrico

Footnotes: 
[1]  http://git.lttng.org/?p=userspace-rcu.git;a=commitdiff;h=4b79310
Richard Purdie - June 27, 2014, 10:12 a.m.
On Fri, 2014-06-27 at 11:56 +0200, Enrico Scholz wrote:
> Saul Wold <sgw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> writes:
> 
> > rename from meta/recipes-support/liburcu/liburcu_0.8.1.bb
> > rename to meta/recipes-support/liburcu/liburcu_0.8.4.bb
> 
> With this version, build fails always with
> 
> | liburcu/0.8.4-r0/userspace-rcu-0.8.4/urcu/compiler.h:125:5: error: #error Your gcc version produces clobbered frame accesses
> |  #   error Your gcc version produces clobbered frame accesses
> | make[2]: *** [wfqueue.lo] Error 1
> 
> This new package seems to blacklist[1] gcc-4.8.0 till gcc-4.8.2 which is
> used by OE.

OE-Core is using gcc 4.9 by default now?

That said do we know which fix is needed for gcc 4.8.x? I thought we
were on 4.8.2 to be honest but its possible we weren't...

Cheers,

Richard
Enrico Scholz - June 27, 2014, 10:39 a.m.
Richard Purdie <richard.purdie@linuxfoundation.org> writes:

>> This new package seems to blacklist[1] gcc-4.8.0 till gcc-4.8.2 which is
>> used by OE.
>
> OE-Core is using gcc 4.9 by default now?

yes; but 4.8.2 is still in the tree.


> That said do we know which fix is needed for gcc 4.8.x?

The urcu commit which blacklists gcc 4.8 refers to

           https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854

The patch mentioned in this report is applied to our gcc 4.8.2

  meta/recipes-devtools/gcc/gcc-4.8/0048-PR58854_fix_arm_apcs_epilogue.patch



Enrico

Patch

diff --git a/meta/recipes-support/liburcu/liburcu/fixsepbuild.patch b/meta/recipes-support/liburcu/liburcu/fixsepbuild.patch
deleted file mode 100644
index 9cd0ab9..0000000
--- 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
similarity index 77%
rename from meta/recipes-support/liburcu/liburcu_0.8.1.bb
rename to meta/recipes-support/liburcu/liburcu_0.8.4.bb
index a9e7b2c..cd7af24 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"