Skip to content

Commit ed7e01b

Browse files
committed
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 <[email protected]>
1 parent de1b801 commit ed7e01b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

package/libs/libtraceevent/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ PKG_FIXUP:=autoreconf
1414
PKG_INSTALL:=1
1515

1616
include $(INCLUDE_DIR)/package.mk
17+
include $(INCLUDE_DIR)/meson.mk
1718

1819
define Package/libtraceevent
1920
SECTION:=libs
@@ -32,28 +33,27 @@ define Package/libtraceevent-extra
3233
SECTION:=libs
3334
CATEGORY:=Libraries
3435
TITLE:=Extra plugins for libtraceevent
35-
DEPENDS:=
36+
DEPENDS:=+libtraceevent
3637
endef
3738

38-
CONFIGURE_ARGS+= \
39-
--enable-shared \
40-
--enable-static
39+
MESON_ARGS += \
40+
-Ddoc=false
4141

42-
PLUGINS_DIR := $(PKG_BUILD_DIR)/plugins
42+
PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/traceevent/plugins
4343
PLUGINS_MAIN := function hrtimer mac80211 sched_switch
4444

4545
define Build/InstallDev
4646
$(INSTALL_DIR) $(1)/usr/include
47-
$(CP) $(PKG_BUILD_DIR)/include/traceevent $(1)/usr/include/
47+
$(CP) $(PKG_INSTALL_DIR)/usr/include/traceevent $(1)/usr/include/
4848
$(INSTALL_DIR) $(1)/usr/lib
49-
$(CP) $(PKG_BUILD_DIR)/lib/libtraceevent.{a,so*} $(1)/usr/lib/
49+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtraceevent.{a,so*} $(1)/usr/lib/
5050
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
51-
$(CP) $(PKG_BUILD_DIR)/libtraceevent.pc $(1)/usr/lib/pkgconfig/
51+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtraceevent.pc $(1)/usr/lib/pkgconfig/
5252
endef
5353

5454
define Package/libtraceevent/install
5555
$(INSTALL_DIR) $(1)/usr/lib/traceevent/plugins
56-
$(CP) $(PKG_BUILD_DIR)/lib/libtraceevent.so.* $(1)/usr/lib/
56+
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtraceevent.so.* $(1)/usr/lib/
5757
$(INSTALL_DIR) $(1)/usr/lib
5858
$(CP) \
5959
$(patsubst %,$(PLUGINS_DIR)/plugin_%.so,$(PLUGINS_MAIN)) \

0 commit comments

Comments
 (0)