hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-12-12 15:42:11 -05:00
Code Issues Projects Releases Wiki Activity

libtraceevent: switch to meson and add missing dep for libtraceevent-extra

Browse Source 
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@gmail.com>
This commit is contained in:
Christian Marangi 2025-11-27 13:39:57 +01:00
parent de1b8012fe
commit ed7e01b7b6
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/libs/libtraceevent/Makefile
View File

@ -14,6 +14,7 @@ PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libtraceevent define Package/libtraceevent
SECTION:=libs SECTION:=libs
@ -32,28 +33,27 @@ define Package/libtraceevent-extra
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Extra plugins for libtraceevent TITLE:=Extra plugins for libtraceevent
DEPENDS:= DEPENDS:=+libtraceevent
endef endef
CONFIGURE_ARGS+= \ MESON_ARGS += \
--enable-shared \ -Ddoc=false
--enable-static
PLUGINS_DIR := $(PKG_BUILD_DIR)/plugins PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/traceevent/plugins
PLUGINS_MAIN := function hrtimer mac80211 sched_switch PLUGINS_MAIN := function hrtimer mac80211 sched_switch
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(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 $(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 $(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 endef
define Package/libtraceevent/install define Package/libtraceevent/install
$(INSTALL_DIR) $(1)/usr/lib/traceevent/plugins $(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 $(INSTALL_DIR) $(1)/usr/lib
$(CP) \ $(CP) \
$(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \ $(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \