Skip to contentSkip to conversation

liburcu: bump to version 0.8.0

PATCH New Olivier Schonken 2 participants 10 messages Oct 30, 2013 – Nov 3, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 liburcu: bump to version 0.8.0

Also added a patch to keep liburcu from trying to build examples in doc directory, which breaks cross-compilation when enabled.

---
 .../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
package/liburcu/0001-Removed-Examples-from-doc.patch new file +22 -0
new file mode 100644
index 0000000..7df05b8
@@ -0,0 +1,22 @@
+From 3f8b92364d39df34b327f50e93ab9350a0adb981 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <[email protected]>
+Date: Wed, 9 Oct 2013 16:36:03 +0200
+Subject: [PATCH] Removed Examples subdir - breaks crosscompilation
+
+Signed-off-by: Olivier Schonken <[email protected]>
+---
+ 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
+
package/liburcu/liburcu.mk +2 -1
index a586382..fa14a14 100644
@@ -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))
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/5 lttng-tools: bump to version 2.3.0

---
 package/lttng-tools/lttng-tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-tools/lttng-tools.mk +1 -1
index f6eff96..2daed43 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.2.0
+LTTNG_TOOLS_VERSION = 2.3.0
 LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools/
 LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_LICENSE = GPLv2; LGPLv2.1 for include/lttng/* and src/lib/lttng-ctl/*
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 3/5 lttng-modules: bump to version 2.3.2

In reply to Olivier Schonken
---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-modules/lttng-modules.mk +1 -1
index baa421e..22a33cd 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.2.0
+LTTNG_MODULES_VERSION = 2.3.2
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules/
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH 4/5 lttng-libust: bump to version 2.3.0

In reply to Olivier Schonken
---
 package/lttng-libust/lttng-libust.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-libust/lttng-libust.mk +1 -1
index b0ebd3f..14e2852 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
-LTTNG_LIBUST_VERSION = 2.2.0
+LTTNG_LIBUST_VERSION = 2.3.0
 LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 LTTNG_LIBUST_LICENSE = LGPLv2.1; GPLv2 for lttng-gen-tp and ust-ctl
 LTTNG_LIBUST_LICENSE_FILES = COPYING
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH 5/5 util-linux: Fix cross-compile for host-util-linux when ncurses not selected

In reply to Olivier Schonken

If util-linux is being cross-compiled with Codesourcery, and ncurses is not selected, compilation of host-util-linux stops at the configuration script, unable to locate host-ncurses.

---
 package/util-linux/util-linux.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/util-linux/util-linux.mk +6 -0
index 4db1e52..f6ad93f 100644
@@ -86,6 +86,12 @@ HOST_UTIL_LINUX_CONF_OPT += \
 	--disable-su --disable-switch_root --disable-unshare \
 	--disable-uuidd --disable-wall
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+HOST_UTIL_LINUX_DEPENDENCIES += ncurses
+else
+HOST_UTIL_LINUX_CONF_OPT += --without-ncurses
+endif
+
 # Avoid building the tools if they are disabled since we can't install on
 # a per-directory basis.
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
Signature · 1 line
1.8.3.2
#5 lore raw

PATCH 5/5 util-linux: Fix cross-compile for host-util-linux when ncurses not selected

Dear Olivier Schonken,

package/util-linux/util-linux.mk HOST_UTIL_LINUX_CONF_OPT += \ · line 93

Quoted 5 lines · Olivier Schonken
package/util-linux/util-linux.mk +5 -0
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+HOST_UTIL_LINUX_DEPENDENCIES += ncurses
+else
+HOST_UTIL_LINUX_CONF_OPT += --without-ncurses
+endif

This cannot be correct. BR2_PACKAGE_NCURSES tells whether ncurses is enabled for the target, but you're using that to decide how to configure the host util-linux.

Since I believe we most likely don't need ncurses support at all in the host util-linux, we can unconditionally add a --without-ncurses to HOST_UTIL_LINUX_CONF_OPT. Could you resend an updated patch that implements this?

Also, it would be good if you could improve the commit log by adding the relevant piece of build log containing the util-linux configure error.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#6 lore raw

PATCH 5/5 util-linux: Fix cross-compile for host-util-linux when ncurses not selected

Hi Thomas

I have again tried to reproduce the build failure, but I am unable. My only guess is that something went wrong while linking host-util-linux with the installed ncurses-dev (64-bit) using the 32-bit gcc and g++ tools that were installed at the time. Will try to reproduce, but I might have to do a clean install of ubuntu 13.10, and follow my exact steps. Will remove this patch from patchwork for now, and either resubmit, or report back once I hit the issue again.

Regards

Olivier Schonken

Quoted 23 lines · Thomas Petazzoni

Dear Olivier Schonken,

package/util-linux/util-linux.mk HOST_UTIL_LINUX_CONF_OPT += \ · line 93

Quoted 5 lines · Olivier Schonken
package/util-linux/util-linux.mk +5 -0
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+HOST_UTIL_LINUX_DEPENDENCIES += ncurses
+else
+HOST_UTIL_LINUX_CONF_OPT += --without-ncurses
+endif

This cannot be correct. BR2_PACKAGE_NCURSES tells whether ncurses is enabled for the target, but you're using that to decide how to configure the host util-linux.

Since I believe we most likely don't need ncurses support at all in the host util-linux, we can unconditionally add a --without-ncurses to HOST_UTIL_LINUX_CONF_OPT. Could you resend an updated patch that implements this?

Also, it would be good if you could improve the commit log by adding the relevant piece of build log containing the util-linux configure error.

Quoted 8 lines

Thanks a lot!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131031/4f8c1ca7/attachment.html>

#7 lore raw

PATCH 5/5 util-linux: Fix cross-compile for host-util-linux when ncurses not selected

Dear Olivier Schonken,

Quoted 7 lines · Olivier Schonken

I have again tried to reproduce the build failure, but I am unable. My only guess is that something went wrong while linking host-util-linux with the installed ncurses-dev (64-bit) using the 32-bit gcc and g++ tools that were installed at the time. Will try to reproduce, but I might have to do a clean install of ubuntu 13.10, and follow my exact steps. Will remove this patch from patchwork for now, and either resubmit, or report back once I hit the issue again.

Well, anyhow, I believe it's safe and a good idea to pass --without-ncurses when building host-util-linux, so that util-linux doesn't try to look for some ncurses support on the host machine (we don't need ncurses support in host-util-linux at all).

Can you send a patch that does just this?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#8 lore raw

PATCH 1/5 liburcu: bump to version 0.8.0

In reply to Olivier Schonken

Dear Olivier Schonken,

Quoted 9 lines · Olivier Schonken

Also added a patch to keep liburcu from trying to build examples in doc directory, which breaks cross-compilation when enabled.

---
 .../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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#9 lore raw

PATCH 1/5 liburcu: bump to version 0.8.0

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

Quoted 21 lines · Thomas Petazzoni

Dear Olivier Schonken,

Quoted 1 line · Olivier Schonken

Also added a patch to keep liburcu from trying to build examples in doc

directory,

Quoted 5 lines

which breaks cross-compilation when enabled.

---
 .../liburcu/0001-Removed-Examples-from-doc.patch   | 22

++++++++++++++++++++++

Quoted 3 lines
 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.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131103/20737be2/attachment.html>