Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13538 from neheb/glbbbb

Browse source 
glib2: remove static library hack
This commit is contained in:
Rosen Penev 2020-09-30 19:09:24 -07:00 committed by GitHub
commit 970507bbf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/glib2/Makefile
View file

@ -49,6 +49,7 @@ TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections -liconv $(if $(INTL_FULL),-lintl) TARGET_LDFLAGS += -Wl,--gc-sections -liconv $(if $(INTL_FULL),-lintl)
COMP_ARGS= \ COMP_ARGS= \
-Ddefault_library=both \
-Diconv=external \ -Diconv=external \
-Dselinux=disabled \ -Dselinux=disabled \
-Dlibmount=disabled \ -Dlibmount=disabled \
@ -69,22 +70,6 @@ COMP_ARGS= \
MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true 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 define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(CP) \ $(CP) \