mirror of https://github.com/openwrt/packages.git
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
parent
ecbe2cc625
commit
f132daf59e
|
@ -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) \
|
||||
|
|
Loading…
Reference in New Issue