Patchwork [1/5] liburcu: bump to version 0.8.0

login
register
mail settings
Submitter Olivier Schonken
Date Oct. 30, 2013, 8:20 p.m.
Message ID <1383164412-20657-1-git-send-email-olivier.schonken@gmail.com>
Download mbox | patch
Permalink /patch/287338/
State Superseded
Headers show

Comments

Olivier Schonken - Oct. 30, 2013, 8:20 p.m.
Also added a patch to keep liburcu from trying to build examples in doc directory,
which breaks cross-compilation when enabled.

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 .../liburcu/0001-Removed-Examples-from-doc.patch   | 22 ++++++++++++++++++++++
 package/liburcu/liburcu.mk                         |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 package/liburcu/0001-Removed-Examples-from-doc.patch
Thomas Petazzoni - Nov. 2, 2013, 5:41 p.m.
Dear Olivier Schonken,

On Wed, 30 Oct 2013 22:20:08 +0200, Olivier Schonken wrote:
> Also added a patch to keep liburcu from trying to build examples in doc directory,
> which breaks cross-compilation when enabled.
> 
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
>  .../liburcu/0001-Removed-Examples-from-doc.patch   | 22 ++++++++++++++++++++++
>  package/liburcu/liburcu.mk                         |  3 ++-
>  2 files changed, 24 insertions(+), 1 deletion(-)
>  create mode 100644 package/liburcu/0001-Removed-Examples-from-doc.patch

Can you instead integrate the upstream fix for the examples build
problem? See
http://git.lttng.org/?p=userspace-rcu.git;a=commitdiff;h=3343c545bbc5154d42dd37cd3ae869ef97555e00
for the patch.

Thanks,

Thomas
Olivier Schonken - Nov. 3, 2013, 8:32 p.m.
Hi Thomas

With the upstream patch compilations still fails, because the doc makefile
tries to use the host linker (/usr/bin/ld) to link against the target
liburcu.

Making all in doc
make[3]: Entering directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc'
Making all in examples
make[4]: Entering directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples'
/usr/bin/make -f dist-files/Makefile AM_CPPFLAGS="-D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I../../../urcu/ -I../../../"
AM_CFLAGS='-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64  -pipe -Os ' AM_LDFLAGS=' -L../../../.libs/
-Wl,-rpath="/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/../../.libs/"'
all
make[5]: Entering directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples'
/usr/bin/make -C hlist
make[6]: Entering directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/hlist'
/usr/bin/make -f Makefile.cds_hlist_add_head_rcu
make[7]: Entering directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/hlist'
cc  -g -O2 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -I../../../urcu/ -I../../../ -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -pipe -Os  \
        -c -o cds_hlist_add_head_rcu.o cds_hlist_add_head_rcu.c
cc -g -O2 -Wall  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64  -pipe -Os  -L../../../.libs/
-Wl,-rpath="/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/../../.libs/"
\
        -o cds_hlist_add_head_rcu cds_hlist_add_head_rcu.o -lurcu
/usr/bin/ld: skipping incompatible ../../../.libs//liburcu.so when
searching for -lurcu
/usr/bin/ld: skipping incompatible ../../../.libs//liburcu.a when searching
for -lurcu
/usr/bin/ld: cannot find -lurcu
collect2: error: ld returned 1 exit status
make[7]: *** [cds_hlist_add_head_rcu] Error 1
make[7]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/hlist'
make[6]: *** [all] Error 2
make[6]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples/hlist'
make[5]: *** [all] Error 2
make[5]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples'
make[4]: *** [all-local] Error 2
make[4]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc/examples'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0/doc'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0'
make[1]: *** [all] Error 2
make[1]: Leaving directory
`/home/incognito/buildroot-new/output/build/liburcu-0.8.0'
make: ***
[/home/incognito/buildroot-new/output/build/liburcu-0.8.0/.stamp_built]
Error 2

Regards

Olivier Schonken


On Sat, Nov 2, 2013 at 7:41 PM, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Dear Olivier Schonken,
>
> On Wed, 30 Oct 2013 22:20:08 +0200, Olivier Schonken wrote:
> > Also added a patch to keep liburcu from trying to build examples in doc
> directory,
> > which breaks cross-compilation when enabled.
> >
> > Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> > ---
> >  .../liburcu/0001-Removed-Examples-from-doc.patch   | 22
> ++++++++++++++++++++++
> >  package/liburcu/liburcu.mk                         |  3 ++-
> >  2 files changed, 24 insertions(+), 1 deletion(-)
> >  create mode 100644 package/liburcu/0001-Removed-Examples-from-doc.patch
>
> Can you instead integrate the upstream fix for the examples build
> problem? See
>
> http://git.lttng.org/?p=userspace-rcu.git;a=commitdiff;h=3343c545bbc5154d42dd37cd3ae869ef97555e00
> for the patch.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>

Patch

diff --git a/package/liburcu/0001-Removed-Examples-from-doc.patch b/package/liburcu/0001-Removed-Examples-from-doc.patch
new file mode 100644
index 0000000..7df05b8
--- /dev/null
+++ b/package/liburcu/0001-Removed-Examples-from-doc.patch
@@ -0,0 +1,22 @@ 
+From 3f8b92364d39df34b327f50e93ab9350a0adb981 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Wed, 9 Oct 2013 16:36:03 +0200
+Subject: [PATCH] Removed Examples subdir - breaks crosscompilation
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ doc/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d98f16b..821cc19 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,3 +1,3 @@
+-SUBDIRS = examples
++SUBDIRS = 
+ 
+ dist_doc_DATA = rcu-api.txt cds-api.txt uatomic-api.txt
+-- 
+1.7.9.5
+
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index a586382..fa14a14 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -4,12 +4,13 @@ 
 #
 ################################################################################
 
-LIBURCU_VERSION = 0.7.7
+LIBURCU_VERSION = 0.8.0
 LIBURCU_SITE    = http://lttng.org/files/urcu/
 LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt LICENSE
 
 LIBURCU_INSTALL_STAGING = YES
+LIBURCU_AUTORECONF = YES
 
 $(eval $(autotools-package))