diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-09-22 10:26:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-09-22 10:26:39 +0200 |
| commit | 421c902927325b3308d039342660797c1f8e4edf (patch) | |
| tree | 2040066e0523f16fb031511923684d07f97d2fa6 /package/glib | |
| parent | 6ad1911de32149ab7d2c2934be49642ac6754216 (diff) | |
firefox: update to 129.0.2
Diffstat (limited to 'package/glib')
| -rw-r--r-- | package/glib/Makefile | 32 | ||||
| -rw-r--r-- | package/glib/patches/patch-meson_build | 6 |
2 files changed, 16 insertions, 22 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile index eb77cf8fe..f83648bae 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -10,8 +10,8 @@ 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:= pcre2 zlib libffi -PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 +PKG_DEPENDS:= pcre2 zlib libffi libiconv +PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 libiconv 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 @@ -28,29 +28,23 @@ $(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 +HOST_MESON_FLAGS:= --default-library static -Dtests=false -Dxattr=false -Doss_fuzz=disabled 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) - -do-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) +hostpost-install: + $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/glib-2.0.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 diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build index c410eac33..dbc6c7457 100644 --- a/package/glib/patches/patch-meson_build +++ b/package/glib/patches/patch-meson_build @@ -1,6 +1,6 @@ ---- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100 -+++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100 -@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = +--- glib-2.78.4.orig/meson.build 2024-01-21 20:48:20.000000000 +0100 ++++ glib-2.78.4/meson.build 2024-08-30 10:20:24.877632538 +0200 +@@ -527,6 +527,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = '-Werror=missing-include-dirs', '-Werror=pointer-arith', '-Werror=unused-result', |