[openwrt/openwrt] libtraceevent: switch to meson and add missing dep for libtraceevent-extra

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 27 04:41:59 PST 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ed7e01b7b6413672be10513ee404f15eddd07e75

commit ed7e01b7b6413672be10513ee404f15eddd07e75
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Nov 27 13:39:57 2025 +0100

    libtraceevent: switch to meson and add missing dep for libtraceevent-extra
    
    Switch to Meson build system and add missing dependency for
    libtraceevent-extra.
    
    This switch indirectly fix a compilation error on 32bit target that
    weren't getting correct target CFlags. Using Meson fix honour our CFlags
    and fix the compilation error.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 package/libs/libtraceevent/Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/libs/libtraceevent/Makefile b/package/libs/libtraceevent/Makefile
index 49568e69cc..34da6f04c3 100644
--- a/package/libs/libtraceevent/Makefile
+++ b/package/libs/libtraceevent/Makefile
@@ -14,6 +14,7 @@ PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
 
 define Package/libtraceevent
   SECTION:=libs
@@ -32,28 +33,27 @@ define Package/libtraceevent-extra
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Extra plugins for libtraceevent
-  DEPENDS:=
+  DEPENDS:=+libtraceevent
 endef
 
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static
+MESON_ARGS += \
+        -Ddoc=false
 
-PLUGINS_DIR := $(PKG_BUILD_DIR)/plugins
+PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/traceevent/plugins
 PLUGINS_MAIN := function hrtimer mac80211 sched_switch
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/include/traceevent $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/traceevent $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libtraceevent.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtraceevent.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/libtraceevent.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtraceevent.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libtraceevent/install
 	$(INSTALL_DIR) $(1)/usr/lib/traceevent/plugins
-	$(CP) $(PKG_BUILD_DIR)/lib/libtraceevent.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtraceevent.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) \
 		$(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \




More information about the lede-commits mailing list