diff options
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 429bb7365..51276ee1a 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.84.3 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.70 -PKG_HASH:= 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 +PKG_EXTRAVER:= 2.84 +PKG_HASH:= aa4f87c3225bf57ca85f320888f7484901a17934ca37023c3bd8435a72db863e 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 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)/ @@ -24,33 +25,38 @@ 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_STYLE:= meson +HOST_INSTALL_STYLE:= meson -HOST_CONFIG_STYLE:= manual -HOST_STYLE:= manual CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled +HOST_MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dsysprof=disabled \ + --default-library=static +MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dglib_debug=disabled \ + -Dsysprof=disabled -host-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) - -host-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) - -glib-hostinstall: - (cd $(WRKBUILD) && 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) - -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 @@ -59,6 +65,7 @@ glib-install: $(CP) $(WRKINST)/usr/lib/libgobject*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgmodule*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgthread*.so* $(IDIR_GLIB)/usr/lib + -$(CP) $(WRKINST)/usr/lib/libintl*.so* $(IDIR_GLIB)/usr/lib # workaround for dev subpackage $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/include $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/lib/glib-2.0/include |