diff options
Diffstat (limited to 'package/glib/Makefile')
| -rw-r--r-- | package/glib/Makefile | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index 5dbfc4745..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.56.1 +PKG_VERSION:= 2.84.3 PKG_RELEASE:= 1 -PKG_EXTRAVER:= 2.56 -PKG_HASH:= 40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d +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,42 +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))) -ifeq ($(ADK_PACKAGE_LIBICONV),y) -CONFIGURE_ARGS+= --with-libiconv=yes -else -CONFIGURE_ARGS+= --with-libiconv=no -endif -CONFIGURE_ARGS+= --disable-mem-pools \ - --disable-rebuilds \ - --disable-fam \ - --disable-dtrace \ - --disable-compile-warnings \ - --with-pcre=system \ - --with-threads=posix -CONFIGURE_ENV+= glib_cv_long_long_format=ll \ - glib_cv_stack_grows=no \ - glib_cv_have_strlcpy=no \ - glib_cv_uscore=no \ - ac_cv_func_posix_getpwuid_r=yes \ - ac_cv_func_posix_getgrgid_r=yes +HOSTWRKBUILD= $(WRKSRC) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_STYLE:= auto -HOST_CPPFLAGS+= -I$(STAGING_HOST_DIR)/usr/include/libmount -ifneq ($(OS_FOR_BUILD),CYGWIN) -HOST_CFLAGS+= -fPIC -endif -HOST_CONFIGURE_ARGS+= --disable-fam \ - --disable-selinux \ - --disable-dtrace \ - --enable-static \ - --with-pcre=internal \ - --with-libiconv=yes \ - --disable-shared \ - --disable-compile-warnings +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +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 hostpost-install: - $(CP) $(STAGING_HOST_DIR)/usr/lib/glib-2.0/include/glibconfig.h \ - $(STAGING_HOST_DIR)/usr/include/glib-2.0/ + $(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 @@ -68,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 |