glib2: remove static library hack

There's a better and faster way to do this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
pull/13538/head
Rosen Penev 2020-09-28 22:37:48 -07:00
parent ecbe2cc625
commit f132daf59e
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
1 changed files with 1 additions and 16 deletions

View File

@ -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) \