Re: [OE-core] [PATCH] libtraceevent: build with Meson

2023-08-28 Thread Luca Ceresoli via lists.openembedded.org
Hello,

On Sun, 27 Aug 2023 20:57:44 +0100
"Ross Burton"  wrote:

> From: Ross Burton 
> 
> After what I presume is the recent kernel upgrade, perf started to fail
> to configure.  This was actually due to libtraceevent racing during its
> build and failing to put one of the .o files into the .so (reminder:
> Make is terrible). This doesn't cause the libtraceevent build to fail so
> once the broken .so is in sstate, it causes all future perf builds to
> fail.
> 
> Instead of rewriting the Makefile rules to fix this race it's easier to
> switch to Meson which doesn't have this sort of problem. However the
> Meson support is pretty new and has some rough edges, so we need a patch
> to make it do the right thing.
> 
> I will submit the libtraceevent fixes upstream shortly.
> 
> [ YOCTO #15201 ]
> 
> Signed-off-by: Ross Burton 

The build I had run and that had been consistently failing has succeeded
after applying this patch!

Tested-by: Luca Ceresoli 

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#186836): 
https://lists.openembedded.org/g/openembedded-core/message/186836
Mute This Topic: https://lists.openembedded.org/mt/100996987/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[OE-core] [PATCH] libtraceevent: build with Meson

2023-08-27 Thread Ross Burton
From: Ross Burton 

After what I presume is the recent kernel upgrade, perf started to fail
to configure.  This was actually due to libtraceevent racing during its
build and failing to put one of the .o files into the .so (reminder:
Make is terrible). This doesn't cause the libtraceevent build to fail so
once the broken .so is in sstate, it causes all future perf builds to
fail.

Instead of rewriting the Makefile rules to fix this race it's easier to
switch to Meson which doesn't have this sort of problem. However the
Meson support is pretty new and has some rough edges, so we need a patch
to make it do the right thing.

I will submit the libtraceevent fixes upstream shortly.

[ YOCTO #15201 ]

Signed-off-by: Ross Burton 
---
 ...not-preserve-ownership-in-cp-command.patch | 40 --
 .../libtraceevent/libtraceevent/meson.patch   | 74 +++
 .../libtraceevent/libtraceevent_1.7.3.bb  | 10 +--
 3 files changed, 77 insertions(+), 47 deletions(-)
 delete mode 100644 
meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
 create mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch

diff --git 
a/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
 
b/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
deleted file mode 100644
index 5e88048817e..000
--- 
a/meta/recipes-kernel/libtraceevent/libtraceevent/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ed0a31000305d937abe47c44d705b5b52bb36f79 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Thu, 22 Dec 2022 18:32:17 -0800
-Subject: [PATCH] makefile: Do not preserve ownership in cp command
-
-Fixes
-
-ERROR: libtraceevent-1.7.0-r0 do_package_qa: QA Issue: libtraceevent: 
/usr/lib/libtraceevent.a is owned by uid 1000, which is the same as the user 
running bitbake. This may be due to host contamination [host-user-contaminated]
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj 

- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 965ff47..0e782cb 100644
 a/Makefile
-+++ b/Makefile
-@@ -287,7 +287,7 @@ $(BUILD_PREFIX): force
-   $(Q)$(call build_prefix,$(prefix))
- 
- define do_make_pkgconfig_file
--  cp -f ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE};\
-+  install -m 0644 ${PKG_CONFIG_SOURCE_FILE}.template ${PKG_CONFIG_FILE};  
\
-   sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE};\
-   sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \
-   sed -i "s|LIB_DIR|${libdir_relative}|g" ${PKG_CONFIG_FILE}; \
-@@ -335,7 +335,7 @@ install: install_libs install_plugins
- 
- install_libs: libs install_headers install_pkgconfig
-   $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)); \
--  cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ)
-+  cp --no-preserve=ownership --recursive $(LIB_INSTALL) 
$(DESTDIR)$(libdir_SQ)
-   $(Q)$(call install_ld_config)
- 
- install_pkgconfig: $(PKG_CONFIG_FILE)
--- 
-2.39.0
-
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch 
b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
new file mode 100644
index 000..38b6107136f
--- /dev/null
+++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
@@ -0,0 +1,74 @@
+Fixes for the Meson build of libtraceevent:
+
+- Make the plugin directory the same as the Makefiles
+- Install the plugins as modules not static and versioned shared libraries
+- Add an option to disable building the documentation (needs asciidoc and 
xmlto)
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton 
+
+diff --git a/meson.build b/meson.build
+index b61c873..4bba4d8 100644
+--- a/meson.build
 b/meson.build
+@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir'))
+ libdir = join_paths(prefixdir, get_option('libdir'))
+ plugindir = get_option('plugindir')
+ if plugindir == ''
+-plugindir = join_paths(libdir, 'libtraceevent/plugins')
++plugindir = join_paths(libdir, 'traceevent/plugins')
+ endif
+ 
+ add_project_arguments(
+@@ -45,10 +45,13 @@ if cunit_dep.found()
+ subdir('utest')
+ endif
+ subdir('samples')
+-subdir('Documentation')
+ 
+-custom_target(
+-'docs',
+-output: 'docs',
+-depends: [html, man],
+-command: ['echo'])
++if get_option('docs')
++subdir('Documentation')
++
++custom_target(
++'docs',
++output: 'docs',
++depends: [html, man],
++command: ['echo'])
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index b2294f6..0611216 100644
+--- a/meson_options.txt
 b/meson_options.txt
+@@ -4,6 +4,10 @@
+ 
+ option('plugindir', type : 'string',
+description : 'set the plugin dir')
++
++option('docs', type : 'boolean', value: true,