Commit f7f78d49 authored by Matthew Waters's avatar Matthew Waters 🐨
Browse files

recipes: don't build libiconv on OSX/iOS

- It's provided by the relevant SDK's already
- cerbero builds a more recent version of libiconv that has a
  different major version according to the dylib versioning scheme.
- linking with another library or framework that depends on the
  provided libiconv (e.g. Qt) will fail due to a version mismatch.

https://bugzilla.gnome.org/show_bug.cgi?id=754881
parent d8eabc44
......@@ -26,12 +26,11 @@ class Package(package.Package):
platform_files = {
Platform.WINDOWS: ['gettext:libs:lang', 'libiconv:libs:lang',
'mingw-runtime', 'bionic-fixup:libs'],
Platform.DARWIN: ['gettext:libs:lang', 'libiconv:libs:lang',
'bionic-fixup:libs'],
Platform.DARWIN: ['gettext:libs:lang', 'bionic-fixup:libs'],
Platform.LINUX: [],
Platform.ANDROID: ['gettext:libs:lang', 'libiconv:libs:lang', 'gnustl',
'bionic-fixup:libs'],
Platform.IOS: ['gettext:libs:lang', 'libiconv:libs:lang', 'bionic-fixup:libs']
Platform.IOS: ['gettext:libs:lang', 'bionic-fixup:libs']
}
def prepare(self):
......
......@@ -10,7 +10,7 @@ class Recipe(recipe.Recipe):
tarball_dirname = 'gettext-%(version)s'
url = 'http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.5.1.tar.gz'
platform_deps = {
Platform.DARWIN: ['libiconv', 'sed'],
Platform.DARWIN: ['sed'],
Platform.WINDOWS: ['libiconv', 'mingw-runtime'],}
configure_options = ' --disable-java --disable-csharp --disable-native-java --without-csv'
......
......@@ -11,8 +11,6 @@ class Recipe(recipe.Recipe):
srcdir = 'gettext-runtime'
patches = ['gettext/0001-Fix-linker-error-redefinition-of-vasprintf.patch']
platform_deps = {
Platform.DARWIN: ['libiconv'],
Platform.IOS: ['libiconv'],
Platform.ANDROID: ['libiconv'],
Platform.WINDOWS: ['mingw-runtime'],
}
......
......@@ -25,5 +25,5 @@ class Recipe(recipe.Recipe):
files_lang = ['libiconv']
def prepare(self):
if self.config.target_platform != Platform.LINUX:
if self.config.target_platform not in [Platform.LINUX, Platform.DARWIN, Platform.IOS]:
self.runtime_dep = True
......@@ -36,8 +36,10 @@ class Recipe(recipe.Recipe):
self.config.target_platform)
libtool_la.save()
deps = ['nettle', 'gmp']
if self.config.target_platform not in [Platform.LINUX, Platform.DARWIN, Platform.IOS]:
deps += ['iconv']
if self.config.target_platform != Platform.LINUX:
deps += ['iconv', 'intl']
deps += ['intl']
if self.config.target_platform != Platform.WINDOWS:
deps += ['-lc']
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment