diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 292ac09b06..8abd87ea1d 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -98,10 +98,6 @@ define Build/InstallDev $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig -ifneq ($(INTL_FULL),) - $(SED) '/^Libs:/s/$$$$/ -lintl/' \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/glib-2.0.pc -endif $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(1)/usr/lib/pkgconfig diff --git a/libs/glib2/patches/007-openwrt-libintl.patch b/libs/glib2/patches/007-openwrt-libintl.patch new file mode 100644 index 0000000000..8441e63476 --- /dev/null +++ b/libs/glib2/patches/007-openwrt-libintl.patch @@ -0,0 +1,15 @@ +--- a/meson.build ++++ b/meson.build +@@ -2045,8 +2045,11 @@ endif + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. ++# ++# 007-openwrt-libintl.patch: with BUILD_NLS=y use libintl-full, else use libc ++# + libintl_deps = [] +-if cc.has_function('ngettext', args : osx_ldflags) ++if get_option('nls').disabled() and cc.has_function('ngettext', args : osx_ldflags) + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') + else + # First just find the bare library.