Skip to contentSkip to conversation

package/lttng-tools: fix build with musl

PATCH New Fabrice Fontaine 3 participants 5 messages Aug 17, 2020 – Aug 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/lttng-tools: fix build with musl

Fixes:
- http://autobuild.buildroot.org/results/0c49b3e90361ced63cad4807dbe1b13c595f5f97

---
 ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch
package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch new file +46 -0
new file mode 100644
index 0000000000..e3e0f3a777
@@ -0,0 +1,46 @@
+From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001
+From: Ovidiu Panait <[email protected]>
+Date: Mon, 18 May 2020 16:39:26 +0300
+Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix the following build error with musl libc:
+In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14,
+                 from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10:
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |          ^~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |          ^~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |  ^~~~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |  ^~~~~~~
+
+Signed-off-by: Ovidiu Panait <[email protected]>
+Signed-off-by: J?r?mie Galarneau <[email protected]>
+Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba
+[Retrieved from:
+https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ tests/utils/testapp/gen-ust-events-ns/tp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h
+index 4dbfed51a..e0ddb29a6 100644
+--- a/tests/utils/testapp/gen-ust-events-ns/tp.h
++++ b/tests/utils/testapp/gen-ust-events-ns/tp.h
+@@ -11,6 +11,7 @@
+ #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+ #define _TRACEPOINT_TP_H
+ 
++#include <sys/types.h>
+ #include <lttng/tracepoint.h>
+ 
+ TRACEPOINT_EVENT(tp, tptest,
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/lttng-tools: fix build with musl

Quoted 3 lines · Fabrice Fontaine

Fixes:
- http://autobuild.buildroot.org/results/0c49b3e90361ced63cad4807dbe1b13c595f5f97

Why is this only an error with musl?

Would you mind submitting this to upstream too?

Thanks,

Phil

Quoted 62 lines
---
 ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch
package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch new file +46 -1
new file mode 100644
index 0000000000..e3e0f3a777
@@ -0,0 +1,46 @@
+From 73f906d4d6806afb1962751ccb0fe6c15f320d94 Mon Sep 17 00:00:00 2001
+From: Ovidiu Panait <[email protected]>
+Date: Mon, 18 May 2020 16:39:26 +0300
+Subject: [PATCH] tests: gen-ust-events-ns/tp.h: Fix build with musl libc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix the following build error with musl libc:
+In file included from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:14,
+                 from ../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.c:10:
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |          ^~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/tp.h:17:10: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |          ^~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |  ^~~~~~~
+../../../../../lttng-tools-2.12.0/tests/utils/testapp/gen-ust-events-ns/./tp.h:17:2: error: unknown type name 'ino_t'; did you mean 'int8_t'?
+   17 |  TP_ARGS(ino_t, ns_ino),
+      |  ^~~~~~~
+
+Signed-off-by: Ovidiu Panait <[email protected]>
+Signed-off-by: J?r?mie Galarneau <[email protected]>
+Change-Id: Ic7a73c6754fc30a62bdf6519062c07be65a2eaba
+[Retrieved from:
+https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ tests/utils/testapp/gen-ust-events-ns/tp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/utils/testapp/gen-ust-events-ns/tp.h b/tests/utils/testapp/gen-ust-events-ns/tp.h
+index 4dbfed51a..e0ddb29a6 100644
+--- a/tests/utils/testapp/gen-ust-events-ns/tp.h
++++ b/tests/utils/testapp/gen-ust-events-ns/tp.h
+@@ -11,6 +11,7 @@
+ #if !defined(_TRACEPOINT_TP_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+ #define _TRACEPOINT_TP_H
+
++#include <sys/types.h>
+ #include <lttng/tracepoint.h>
+
+ TRACEPOINT_EVENT(tp, tptest,
--

2.27.0

#2 lore raw

PATCH 1/1 package/lttng-tools: fix build with musl

Quoted 3 lines · On Mon, 17 Aug 2020 16:26:54 -0400 Philippe Proulx <[email protected]>…

Why is this only an error with musl?

Would you mind submitting this to upstream too?

It is already upstream, it's mentioned in the patch from Fabrice:

+[Retrieved from:
+https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94]

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 package/lttng-tools: fix build with musl

Quoted 9 lines · Thomas Petazzoni
Quoted 3 lines · On Mon, 17 Aug 2020 16:26:54 -0400 Philippe Proulx <[email protected]>…

Why is this only an error with musl?

Would you mind submitting this to upstream too?

It is already upstream, it's mentioned in the patch from Fabrice:

Sorry!

Good.

Phil

Quoted 11 lines

+[Retrieved from:
+https://github.com/lttng/lttng-tools/commit/73f906d4d6806afb1962751ccb0fe6c15f320d94]

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

#4 lore raw

PATCH 1/1 package/lttng-tools: fix build with musl

In reply to Fabrice Fontaine
Quoted 8 lines · On Mon, 17 Aug 2020 22:13:35 +0200 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.org/results/0c49b3e90361ced63cad4807dbe1b13c595f5f97

---
 ...nts-ns-tp.h-Fix-build-with-musl-libc.patch | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/lttng-tools/0001-tests-gen-ust-events-ns-tp.h-Fix-build-with-musl-libc.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com