diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-21 19:05:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-21 19:38:15 +0530 |
| commit | bb13990ea51a55d65caa335cb1614e955f769127 (patch) | |
| tree | b5dc1bcd8ab69b924752a4309e3fe64a84e3f0bb | |
| parent | 762146a03503269bf665b9f54289ec68f3006255 (diff) | |
proxy-libintl.recipe: Fix detection with AM_GNU_GETTEXT
Without this, proxy-libintl is not detected correctly by projects that
are looking for gettext with the AM_GNU_GETTEXT autoconf macro. This
causes a build failure in gnutls while building libnice:
libgnutls.so: error: undefined reference to 'libintl_dgettext'
libgnutls.so: error: undefined reference to 'libintl_bindtextdomain'
| -rw-r--r-- | recipes/proxy-libintl.recipe | 1 | ||||
| -rw-r--r-- | recipes/proxy-libintl/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes/proxy-libintl.recipe b/recipes/proxy-libintl.recipe index d3260d7a..72abaebc 100644 --- a/recipes/proxy-libintl.recipe +++ b/recipes/proxy-libintl.recipe @@ -9,6 +9,7 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL btype = BuildType.MESON url = 'https://github.com/frida/proxy-libintl/archive/%(version)s.tar.gz' + patches = [name + '/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch'] files_libs = ['libintl'] files_devel = [ diff --git a/recipes/proxy-libintl/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch b/recipes/proxy-libintl/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch new file mode 100644 index 00000000..435336c8 --- /dev/null +++ b/recipes/proxy-libintl/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch @@ -0,0 +1,32 @@ +From b07decbf3a192a51257351a7d6fd6ff7745e2550 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Mon, 21 May 2018 18:59:07 +0530 +Subject: [PATCH] libintl.h: Fix detection with AM_GNU_GETTEXT + +Without this, the macro tries to use other, more invasive internal +implementation details of gettext to try and detect it and still fails +--- + libintl.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libintl.h b/libintl.h +index 1fc05c9..0bd6aeb 100644 +--- a/libintl.h ++++ b/libintl.h +@@ -26,6 +26,13 @@ + # define LC_MESSAGES 1729 /* Use same value as in GNU gettext */ + #endif + ++/* Define this to make configure checks successfully find gettext in libintl. ++ * This will cause the AM_GNU_GETTEXT([external]) macro to successfully detect ++ * that gettext is in -lintl, not in libc, and needs #include <libintl.h> */ ++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION ++# define __GNU_GETTEXT_SUPPORTED_REVISION ++#endif ++ + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) + # define PROXY_LIBINTL_GNUC_FORMAT(arg_idx) __attribute__((__format_arg__(arg_idx))) + #else +-- +2.17.0 + |