Patchwork [1/3] lttng-libust: bump to version 2.0.1

login
register
mail settings
Submitter Samuel Martin
Date April 15, 2012, 7:17 p.m.
Message ID <1334517476-15258-1-git-send-email-s.martin49@gmail.com>
Download mbox | patch
Permalink /patch/152690/
State Superseded
Headers show

Comments

Samuel Martin - April 15, 2012, 7:17 p.m.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 .../lttng-libust-fix-overflow-32-bits.patch        |   26 --------------------
 package/lttng-libust/lttng-libust.mk               |   11 ++++++---
 2 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
Peter Korsgaard - April 26, 2012, 7:27 a.m.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Thanks. On what toolchain as this been tested?

I gave it a try with our internal toolchain as the older version has
been failing on the autobuilders, but I cannot build the new version
either:

  CCLD   test_urcu_dynamic_link
test_urcu.o: In function `thr_writer':
/home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4'
urcu.o: In function `_uatomic_add_return':
/home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
/home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
urcu.o: In function `_uatomic_or':
/home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4'
urcu.o: In function `call_rcu_data_free':
Samuel Martin - April 26, 2012, 7:52 a.m.
Hi Peter, all,

2012/4/26 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
>
>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>
> Thanks. On what toolchain as this been tested?
I tested it using an "Armdeus-like" toolchain or a qemu_arm_versatile
+ WCHAR + gettext toolchain,
based on the head of master at the time of the submission.

>
> I gave it a try with our internal toolchain as the older version has
> been failing on the autobuilders, but I cannot build the new version
> either:
>
>  CCLD   test_urcu_dynamic_link
> test_urcu.o: In function `thr_writer':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4'
> urcu.o: In function `_uatomic_add_return':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
> urcu.o: In function `_uatomic_or':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4'
> urcu.o: In function `call_rcu_data_free':
>

I don't remember having such troubles.

However, I was not able to build gettext without the patch from Maxime
Ripard (converting gettext to autotarget).
Whatever, this is another topic... on which I have some patches in the
queue I have to rework before posting them...


Regards,


Sam
Thomas Petazzoni - April 26, 2012, 7:59 a.m.
Le Thu, 26 Apr 2012 09:27:04 +0200,
Peter Korsgaard <jacmet@uclibc.org> a écrit :

>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> 
> Thanks. On what toolchain as this been tested?
> 
> I gave it a try with our internal toolchain as the older version has
> been failing on the autobuilders, but I cannot build the new version
> either:
> 
>   CCLD   test_urcu_dynamic_link
> test_urcu.o: In function `thr_writer':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/test_urcu.c:282: undefined reference to `__sync_lock_test_and_set_4'
> urcu.o: In function `_uatomic_add_return':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:180: undefined reference to `__sync_add_and_fetch_4'
> urcu.o: In function `_uatomic_or':
> /home/peko/source/buildroot/output/build/liburcu-0.6.7/tests/../urcu/uatomic/generic.h:145: undefined reference to `__sync_or_and_fetch_4'
> urcu.o: In function `call_rcu_data_free':

You need gcc >= 4.4 to build lttng components. I guess you're using gcc
4.3 here, no?

Thomas
Peter Korsgaard - April 26, 2012, 8:01 a.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Thomas> You need gcc >= 4.4 to build lttng components. I guess you're
 Thomas> using gcc 4.3 here, no?

Ahh yes, this was indeed a prebuilt 4.3 buildroot toolchain - I'll give
our default toolchain a try as well.
Peter Korsgaard - April 26, 2012, 9:06 a.m.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:

 Samuel> Hi Peter, all,
 Samuel> 2012/4/26 Peter Korsgaard <jacmet@uclibc.org>:
 >>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
 >> 
 >>  Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
 >> 
 >> Thanks. On what toolchain as this been tested?
 Samuel> I tested it using an "Armdeus-like" toolchain or a qemu_arm_versatile
 Samuel> + WCHAR + gettext toolchain,
 Samuel> based on the head of master at the time of the submission.

Seems you forgot to update the cxx patch:

>>> lttng-libust 2.0.1 Patching package//lttng-libust

Applying lttng-libust-dont-build-cxx-tests-when-not-available.patch using patch: 
patching file configure.ac
Hunk #1 succeeded at 45 (offset 7 lines).
patching file tests/Makefile.am
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file tests/Makefile.am.rej
Patch failed!  Please fix lttng-libust-dont-build-cxx-tests-when-not-available.patch!

I also added a new patch fixing build with uClibc > 0.9.32 a few minutes
ago.

Care to fix and resubmit?

Patch

diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
deleted file mode 100644
index c2a4dd2..0000000
--- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001
-From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Date: Wed, 21 Dec 2011 16:24:48 -0500
-Subject: [PATCH] Fix clock source overflow on 32-bit archs
-
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- liblttng-ust/clock.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h
-index b5d3e77..23294d2 100644
---- a/liblttng-ust/clock.h
-+++ b/liblttng-ust/clock.h
-@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void)
- 	struct timespec ts;
- 
- 	clock_gettime(CLOCK_MONOTONIC, &ts);
--	return (ts.tv_sec * 1000000000) + ts.tv_nsec;
-+	return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
- }
- 
- static __inline__ uint32_t trace_clock_freq_scale(void)
--- 
-1.7.2.5
-
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index f54999e..de1b145 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -1,6 +1,11 @@ 
-LTTNG_LIBUST_SITE    = http://lttng.org/files/bundles/20111214/
-LTTNG_LIBUST_VERSION = 1.9.2
-LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz
+#############################################################
+#
+# LTTng-UST: the userspace tracing library
+#
+#############################################################
+LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust/
+LTTNG_LIBUST_VERSION = 2.0.1
+LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux