diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2024-07-26 14:30:52 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2024-07-26 15:10:21 +0300 |
| commit | 43c64f9b535d8e793a95647872127d2843ac0f01 (patch) | |
| tree | 49c022997b272f65f96faf667a30431580f0748c | |
| parent | dfc6399b9cb668523fdd1a72af8e2c118b1e6e08 (diff) | |
| download | ydb-43c64f9b535d8e793a95647872127d2843ac0f01.tar.gz | |
Use gettext-stub instead of real gettext
glib mandates gettext to be present:
```
# We require gettext to always be present
glib_conf.set('HAVE_DCGETTEXT', 1)
glib_conf.set('HAVE_GETTEXT', 1)
```
`libintl.h` providing these methods may be taken from
* [GNU gettext](https://savannah.gnu.org/projects/gettext/), which is GPL-licensed,
* [proxy-libintl](https://github.com/frida/proxy-libintl) which proxies the calls into GPL-licensed dynamic library,
* [glibc](https://github.com/bminor/glibc/blob/master/include/libintl.h) which is non-portable,
* [gettext-stub](https://penma.de/code/gettext-stub/) which will simply returns msgid as the current message translation.
This PR switches `contrib/restricted/glib` to the latter solution.
4883165f3590d585992eba7670e427f0330bbe08
| -rw-r--r-- | build/sysincl/misc.yml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml index 30a34aa102..cf47b8622b 100644 --- a/build/sysincl/misc.yml +++ b/build/sysincl/misc.yml @@ -149,10 +149,22 @@ includes: - mkl.h: contrib/libs/intel/mkl/include/mkl.h -# deprecated contrib with ADDINCL to libintl -- source_filter: "^contrib/(deprecated/glib/glib|libs/gdk-pixbuf)" +# Use gettext-stub which has a permissive license +- source_filter: "^contrib/libs/gdk-pixbuf" includes: - - libintl.h: contrib/deprecated/libintl/libintl.h + - libintl.h: contrib/restricted/gettext-stub/libintl.h + +- source_filter: "^contrib/restricted/glib" + includes: + - libintl.h: contrib/restricted/gettext-stub/libintl.h + +- source_filter: "^contrib/restricted/gst-plugins-base" + includes: + - libintl.h: contrib/restricted/gettext-stub/libintl.h + +- source_filter: "^contrib/restricted/gstreamer" + includes: + - libintl.h: contrib/restricted/gettext-stub/libintl.h - source_filter: "^contrib/libs/poco/Data/ODBC" includes: |