diff options
| author | Edward Hervey <edward@centricular.com> | 2018-02-21 16:00:41 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2018-02-21 16:00:41 +0100 |
| commit | 568a948c1a119b58146f078b83fa2d0e48398f34 (patch) | |
| tree | 8aede073d8af44ebcbbc58fc15200b239a31af7a | |
| parent | 884edcd085db0747ca66022c844fc3a311891fc0 (diff) | |
recipes: Upgrade libxml2 to 2.9.7
| -rw-r--r-- | recipes/libxml2.recipe | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes/libxml2.recipe b/recipes/libxml2.recipe index 61e26a3f..f77d36b1 100644 --- a/recipes/libxml2.recipe +++ b/recipes/libxml2.recipe @@ -3,16 +3,13 @@ class Recipe(recipe.Recipe): name = 'libxml2' - version = '2.9.4' + version = '2.9.7' stype = SourceType.TARBALL - url = 'http://xmlsoft.org/sources/libxml2-2.9.4.tar.gz' + url = 'http://xmlsoft.org/sources/libxml2-%(version)s.tar.gz' licenses = [License.MIT] deps = [ 'zlib' ] autoreconf = True - patches = ['libxml2/0001-Enable-windows-cross-compilation.patch', - 'libxml2/0002-makefiles-disable-tests.patch', - 'libxml2/0003-configure-fix-python-dir-prefix.patch', - ] + patches = ['libxml2/0003-configure-fix-python-dir-prefix.patch'] files_libs = ['libxml2'] files_devel = ['include/libxml2', 'lib/xml2Conf.sh', 'bin/xml2-config', @@ -20,7 +17,9 @@ class Recipe(recipe.Recipe): def prepare(self): if self.config.target_platform == Platform.WINDOWS: - self.configure_options = '--without-threads' + if self.config.cross_compiling(): + self.configure_options = '--with-python=no' + self.configure_options += ' --without-threads' elif self.config.target_platform == Platform.ANDROID: self.configure_options = '--with-python=no' elif self.config.target_platform == Platform.IOS: |