diff options
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 429bb7365..eb77cf8fe 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,15 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.70.0 +PKG_VERSION:= 2.78.4 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.70 -PKG_HASH:= 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 +PKG_EXTRAVER:= 2.78 +PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc -PKG_DEPENDS:= libpcre zlib libffi -PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre -HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python2-host gettext-host util-linux-host +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 PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ @@ -24,10 +25,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -TARGET_CFLAGS+= -Wno-error=format-nonliteral - HOST_CONFIG_STYLE:= manual HOST_STYLE:= manual CONFIG_STYLE:= meson @@ -37,13 +37,13 @@ INSTALL_STYLE:= meson MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled host-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) host-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) glib-hostinstall: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) + (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) do-configure: (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ |