diff options
| -rw-r--r-- | packages/base-system-1.0.package | 5 | ||||
| -rw-r--r-- | recipes/build-tools/gettext-tools.recipe | 2 | ||||
| -rw-r--r-- | recipes/gettext.recipe | 2 | ||||
| -rw-r--r-- | recipes/libiconv.recipe | 2 | ||||
| -rw-r--r-- | recipes/nettle/nettle.recipe | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/packages/base-system-1.0.package b/packages/base-system-1.0.package index 10b71b96..fb960dee 100644 --- a/packages/base-system-1.0.package +++ b/packages/base-system-1.0.package @@ -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): diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe index bb3a84d9..909ab742 100644 --- a/recipes/build-tools/gettext-tools.recipe +++ b/recipes/build-tools/gettext-tools.recipe @@ -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' diff --git a/recipes/gettext.recipe b/recipes/gettext.recipe index c31ab1b0..1257420d 100644 --- a/recipes/gettext.recipe +++ b/recipes/gettext.recipe @@ -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'], } diff --git a/recipes/libiconv.recipe b/recipes/libiconv.recipe index 8a350786..589e1802 100644 --- a/recipes/libiconv.recipe +++ b/recipes/libiconv.recipe @@ -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 diff --git a/recipes/nettle/nettle.recipe b/recipes/nettle/nettle.recipe index 716d3a0c..2ef2f969 100644 --- a/recipes/nettle/nettle.recipe +++ b/recipes/nettle/nettle.recipe @@ -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'] |