diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-31 15:29:58 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-31 15:36:33 +0530 |
commit | 49811047bd724b3fccde49f84dea5e17600ed12b (patch) | |
tree | 2fadf2c2e9e64e3c8c0cb7d76d6d45704f64043c | |
parent | d8c0f9b1a1a3128856865491f30b450b298af755 (diff) |
proxy-libintl.recipe: Use the same ABI as gettext on all platforms
-rw-r--r-- | recipes/proxy-libintl.recipe | 3 | ||||
-rw-r--r-- | recipes/proxy-libintl/0001-meson-Use-same-library-versioning-on-macOS-as-gettex.patch | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/recipes/proxy-libintl.recipe b/recipes/proxy-libintl.recipe index 72abaebc..7ec3dfba 100644 --- a/recipes/proxy-libintl.recipe +++ b/recipes/proxy-libintl.recipe @@ -9,7 +9,8 @@ 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'] + patches = [name + '/0001-libintl.h-Fix-detection-with-AM_GNU_GETTEXT.patch', + name + '/0001-meson-Use-same-library-versioning-on-macOS-as-gettex.patch',] files_libs = ['libintl'] files_devel = [ diff --git a/recipes/proxy-libintl/0001-meson-Use-same-library-versioning-on-macOS-as-gettex.patch b/recipes/proxy-libintl/0001-meson-Use-same-library-versioning-on-macOS-as-gettex.patch new file mode 100644 index 00000000..52796c62 --- /dev/null +++ b/recipes/proxy-libintl/0001-meson-Use-same-library-versioning-on-macOS-as-gettex.patch @@ -0,0 +1,27 @@ +From 997181327d4c55b9d5777583fd630954c45900e3 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Wed, 29 Aug 2018 15:17:35 +0530 +Subject: [PATCH] meson: Use same library versioning on macOS as gettext + +Requires Meson 0.48, but that hasn't been released yet. It will just be +ignored on older versions of Meson. +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index 4833043..be5e6f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -10,6 +10,8 @@ install_headers('libintl.h') + intl_shr = shared_library('intl', + 'libintl.c', + c_args: ['-DSTUB_ONLY'], ++ soversion : 8, ++ darwin_versions : ['10', '10.5'], + install : true) + + intl_sta = static_library ('intl', +-- +2.17.1 + |