From f132daf59eeb39a26ade3de1bae29a2328fd0d67 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 28 Sep 2020 22:37:48 -0700 Subject: [PATCH] glib2: remove static library hack There's a better and faster way to do this. Signed-off-by: Rosen Penev --- libs/glib2/Makefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 1fa58fa392..2331cbe859 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -49,6 +49,7 @@ TARGET_CFLAGS += -ffunction-sections -fdata-sections TARGET_LDFLAGS += -Wl,--gc-sections -liconv $(if $(INTL_FULL),-lintl) COMP_ARGS= \ + -Ddefault_library=both \ -Diconv=external \ -Dselinux=disabled \ -Dlibmount=disabled \ @@ -69,22 +70,6 @@ COMP_ARGS= \ MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -# hack to compile static libraries -define Build/Compile - $(call Build/Compile/Meson) - $(call Ninja,-C $(MESON_BUILD_DIR) install,DESTDIR="$(PKG_INSTALL_DIR)") - $(call Meson, \ - --reconfigure \ - --buildtype plain \ - --native-file $(PKG_BUILD_DIR)/openwrt-native.txt \ - --cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \ - -Ddefault_library=static \ - $(MESON_ARGS) \ - $(MESON_BUILD_DIR) \ - $(PKG_BUILD_DIR), \ - $(MESON_VARS)) -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/bin $(CP) \ -- 2.30.2