diff options
Diffstat (limited to 'package/glib/Makefile')
-rw-r--r-- | package/glib/Makefile | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index eb77cf8fe..6de8399e1 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.78.4 +PKG_VERSION:= 2.84.0 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.78 -PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 +PKG_EXTRAVER:= 2.84 +PKG_HASH:= f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= pcre2 zlib libffi PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 -HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host -HOST_BUILDDEP+= pcre2-host meson-host +HOST_BUILDDEP:= pkgconf-host libffi-host python3-host gettext-host util-linux-host +HOST_BUILDDEP+= pcre2-host meson-host zlib-host libiconv-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -28,29 +28,26 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_CONFIG_STYLE:= manual -HOST_STYLE:= manual +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled - -host-configure: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) - -host-build: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) - -glib-hostinstall: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) - -do-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ - --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build) +HOST_MESON_FLAGS:= -Dintrospection=disabled -Dnls=disabled -Dtests=false -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dsysprof=disabled \ + --default-library=static +MESON_FLAGS:= -Dintrospection=disabled -Dtests=false -Dxattr=false -Doss_fuzz=disabled -Dsysprof=disabled -do-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) +hostpost-install: + $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/*.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-genmarshal \ + $(STAGING_HOST_DIR)/usr/bin glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib |