openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-05-31 06:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "glib2: split package into separate libraries"

Browse Source 
It causes multiple failures, which I noticed on OpenWrt buildbots [1]
for several packages [2].

It appears this change wasn't fully tested against a complete build
with all packages. Reverting for now until the issue is resolved.

[1] https://downloads.openwrt.org/snapshots/faillogs/
[2] https://github.com/openwrt/packages/pull/22544

This reverts commit 6bb0d6bd2a.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer
2026-04-27 09:20:13 +02:00
parent 721e5fb9b4
commit 9e3d098382
1 changed files with 6 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/glib2/Makefile
+6 -92
View File
@@ -33,68 +33,14 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/meson.mk
define Package/glib2/default
define Package/glib2
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi +libattr +libpcre2
TITLE:=glib 2.0
URL:=http://www.gtk.org/
endef
define Package/glib2-core
$(call Package/glib2/default)
TITLE:=GLib 2.0 core library
DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +libattr +libpcre2
endef
define Package/glib2-gmodule
$(call Package/glib2/default)
TITLE:=GLib 2.0 gmodule library
DEPENDS:=+glib2-core
endef
define Package/glib2-gthread
$(call Package/glib2/default)
TITLE:=GLib 2.0 gthread library
DEPENDS:=+glib2-core
endef
define Package/glib2-gobject
$(call Package/glib2/default)
TITLE:=GLib 2.0 gobject library
DEPENDS:=+glib2-core +libffi
endef
define Package/glib2-gio
$(call Package/glib2/default)
TITLE:=GLib 2.0 gio library
DEPENDS:=+glib2-core +glib2-gobject +glib2-gmodule +zlib +libffi
endef
define Package/glib2
$(call Package/glib2/default)
TITLE:=Full GLib 2.0 library
DEPENDS:+glib2-gthread +glib2-gio
endef
define Package/glib2-core/description
Common code and core library for GLib library of C routines
endef
define Package/glib2-gmodule/description
GLib library module functions
endef
define Package/glib2-gthread/description
GLib library thread functions
endef
define Package/glib2-gobject/description
GLib library object functions
endef
define Package/glib2-gio/description
GLib library io functions
endef
define Package/glib2/description
The GLib library of C routines
endef
@@ -176,44 +122,12 @@ define Build/InstallDev
$(1)/usr/share/glib-2.0/
endef
define Package/glib2-core/install
define Package/glib2/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libglib-2.0.so* \
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/
endef
define Package/glib2-gmodule/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmodule-2.0.so* \
$(1)/usr/lib
endef
define Package/glib2-gthread/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgthread-2.0.so* \
$(1)/usr/lib
endef
define Package/glib2-gobject/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgobject-2.0.so* \
$(1)/usr/lib
endef
define Package/glib2-gio/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgio-2.0.so* \
$(1)/usr/lib
endef
define Package/glib2/install
:
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,glib2-core))
$(eval $(call BuildPackage,glib2-gmodule))
$(eval $(call BuildPackage,glib2-gthread))
$(eval $(call BuildPackage,glib2-gobject))
$(eval $(call BuildPackage,glib2-gio))
$(eval $(call BuildPackage,glib2))