LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
27080 Commits
1 Branch
46 MiB
Tree: 45f10a3bef
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '45f10a3bef'
${ noResults }
openwrt-packages-dist/libs/glib2/patches/007-openwrt-libintl.patch

15 lines
616 B
Raw Normal View History

glib2: update libintl handling glib2's meson.build runs check cc.has_function('ngettext', args : osx_ldflags) and, if successful, it never looks for non-libc libintl. For musl and glibc this test is always successful. glib2 unconditionally sets ENABLE_NLS, so during compile <libintl.h> gets included always. But then we have a disconnect when the OpenWrt pkg is being built with BUILD_NLS=y, because the <libintl.h> will be from libintl-full but glib2 will not link to libintl-full. With BUILD_NLS=n there's no problem, because the <libintl.h> will be from libc. In lieu of proper libintl detection in glib2's meson build, removing the SED call from the Makefile together with the added patch sorts this out. The SED call can be removed because when we force libintl-full use, the meson build will put the necessary linker flag into the pkg-config file itself. Alpine Linux does something similar (see [1]), but they always force the use of the external libintl. I assume they always go for full NLS support. [1] https://git.alpinelinux.org/aports/tree/main/glib/musl-libintl.patch Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> (cherry picked from commit 721838ddd4832ed4fcad5f4eee6a4b784b30dcae)
2 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. --- a/meson.build

  2. +++ b/meson.build

  3. @@ -2045,8 +2045,11 @@ endif

  4.  # proxy-libintl subproject.
  5.  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  6.  # implementations. This could be extended if issues are found in some platforms.
  7. +#

  8. +# 007-openwrt-libintl.patch: with BUILD_NLS=y use libintl-full, else use libc

  9. +#

  10.  libintl_deps = []
  11. -if cc.has_function('ngettext', args : osx_ldflags)

  12. +if get_option('nls').disabled() and cc.has_function('ngettext', args : osx_ldflags)

  13.    have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
  14.  else
  15.    # First just find the bare library.