diff mbox

blktrace: re-enable on uClibc

Message ID 1471963200-18857-1-git-send-email-thomas.petazzoni@free-electrons.com
State Accepted
Headers show

Commit Message

Thomas Petazzoni Aug. 23, 2016, 2:40 p.m. UTC
With a small patch, blktrace can work on uClibc: we simply need to link
with librt to use the posix_spawn*() functions.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../blktrace/0001-iowatcher-link-with-lrt.patch    | 29 ++++++++++++++++++++++
 package/blktrace/Config.in                         |  6 -----
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 package/blktrace/0001-iowatcher-link-with-lrt.patch

Comments

Peter Korsgaard Aug. 23, 2016, 9:14 p.m. UTC | #1
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > With a small patch, blktrace can work on uClibc: we simply need to link
 > with librt to use the posix_spawn*() functions.

> @@ -10,7 +8,3 @@ config BR2_PACKAGE_BLKTRACE
 >  	  up to user space.
 
 >  	  http://git.kernel.dk/?p=blktrace.git;a=summary
 > -
 > -comment "blktrace needs a glibc or musl toolchain"
 > -	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
 > -	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

I see you created this against master and not next. I know it is a small
patch, but it is still a feature addition. Is there any reason this
should go in 2016.08?
Thomas Petazzoni Aug. 23, 2016, 9:36 p.m. UTC | #2
Hello,

On Tue, 23 Aug 2016 23:14:18 +0200, Peter Korsgaard wrote:

>  > With a small patch, blktrace can work on uClibc: we simply need to link
>  > with librt to use the posix_spawn*() functions.  
> 
> > @@ -10,7 +8,3 @@ config BR2_PACKAGE_BLKTRACE
>  >  	  up to user space.  
>  
>  >  	  http://git.kernel.dk/?p=blktrace.git;a=summary
>  > -
>  > -comment "blktrace needs a glibc or musl toolchain"
>  > -	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
>  > -	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)  
> 
> I see you created this against master and not next. I know it is a small
> patch, but it is still a feature addition. Is there any reason this
> should go in 2016.08?

Not at all. Having the patch based on master is an oversight, it's
definitely intended at the next branch.

Thomas
Thomas Petazzoni Aug. 26, 2016, 2:01 p.m. UTC | #3
Hello,

On Tue, 23 Aug 2016 16:40:00 +0200, Thomas Petazzoni wrote:
> With a small patch, blktrace can work on uClibc: we simply need to link
> with librt to use the posix_spawn*() functions.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  .../blktrace/0001-iowatcher-link-with-lrt.patch    | 29 ++++++++++++++++++++++
>  package/blktrace/Config.in                         |  6 -----
>  2 files changed, 29 insertions(+), 6 deletions(-)
>  create mode 100644 package/blktrace/0001-iowatcher-link-with-lrt.patch

I've applied to next, after adding in the patch a reference to the
upstream commit, since my fix has already been merged upstream.

Thanks,

Thomas
diff mbox

Patch

diff --git a/package/blktrace/0001-iowatcher-link-with-lrt.patch b/package/blktrace/0001-iowatcher-link-with-lrt.patch
new file mode 100644
index 0000000..3712b9f
--- /dev/null
+++ b/package/blktrace/0001-iowatcher-link-with-lrt.patch
@@ -0,0 +1,29 @@ 
+From 80d87b99d72034441ea4fbab81f5c80c1ef3b067 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 23 Aug 2016 16:36:14 +0200
+Subject: [PATCH] iowatcher: link with -lrt
+
+Some C libraries (notably uClibc) have the posix_spawn*() functions in
+librt, so let's link iowatcher with -lrt.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ iowatcher/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iowatcher/Makefile b/iowatcher/Makefile
+index 7b5101c..502476d 100644
+--- a/iowatcher/Makefile
++++ b/iowatcher/Makefile
+@@ -19,7 +19,7 @@ all: $(ALL)
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm
++	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt
+ 
+ depend:
+ 	@$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
+-- 
+2.7.4
+
diff --git a/package/blktrace/Config.in b/package/blktrace/Config.in
index c17de80..38c0947 100644
--- a/package/blktrace/Config.in
+++ b/package/blktrace/Config.in
@@ -1,7 +1,5 @@ 
 config BR2_PACKAGE_BLKTRACE
 	bool "blktrace"
-	# Uses posix_spawn()
-	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBAIO
 	help
@@ -10,7 +8,3 @@  config BR2_PACKAGE_BLKTRACE
 	  up to user space.
 
 	  http://git.kernel.dk/?p=blktrace.git;a=summary
-
-comment "blktrace needs a glibc or musl toolchain"
-	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
-	depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)