diff options
author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-10-17 22:10:09 +0200 |
---|---|---|
committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-10-17 22:10:09 +0200 |
commit | 96ae2c6aa7315c856775fcfbdc4e4c7326817b05 (patch) | |
tree | 763de717d02acb6a7368632ae4aae0ab03d8942d /recipes | |
parent | 1756c31878f4e49f4a1164c0874ecf257f4ad8cb (diff) |
libtool: make this tool cross-platform
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/bzip2.recipe | 3 | ||||
-rw-r--r-- | recipes/nettle.recipe | 6 | ||||
-rw-r--r-- | recipes/taglib.recipe | 3 | ||||
-rw-r--r-- | recipes/zlib.recipe | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/recipes/bzip2.recipe b/recipes/bzip2.recipe index c702936d..45f41d0b 100644 --- a/recipes/bzip2.recipe +++ b/recipes/bzip2.recipe @@ -26,7 +26,8 @@ class Recipe(recipe.Recipe): (shared_makefile, self.config.prefix, extension, self.config.prefix) def post_install(self): - libtool_la = LibtoolLibrary('bz2', 1, 0, 6, self.config.libdir) + libtool_la = LibtoolLibrary('bz2', 1, 0, 6, self.config.libdir, + self.config.target_platform) libtool_la.save() if self.config.target_platform != Platform.WINDOWS: libdir = os.path.join(self.config.prefix, 'lib') diff --git a/recipes/nettle.recipe b/recipes/nettle.recipe index 96c654aa..9203b98a 100644 --- a/recipes/nettle.recipe +++ b/recipes/nettle.recipe @@ -28,12 +28,14 @@ class Recipe(recipe.Recipe): def post_install(self): # Create libtool libraries (.la) - libtool_la = LibtoolLibrary('nettle', 4, 4, 0, self.config.libdir) + libtool_la = LibtoolLibrary('nettle', 4, 4, 0, self.config.libdir, + self.config.target_platform) libtool_la.save() deps = ['nettle', 'gmp', '-lc'] if self.config.target_platform != Platform.LINUX: deps += ['iconv', 'intl'] - libtool_la = LibtoolLibrary('hogweed', 2, 2, 0, self.config.libdir, deps) + libtool_la = LibtoolLibrary('hogweed', 2, 2, 0, self.config.libdir, + self.config.target_platform, deps) libtool_la.save() if self.config.target_platform == Platform.LINUX: diff --git a/recipes/taglib.recipe b/recipes/taglib.recipe index 4a021d11..0389640b 100644 --- a/recipes/taglib.recipe +++ b/recipes/taglib.recipe @@ -26,7 +26,8 @@ class Recipe(recipe.Recipe): deps = ['z'] if self.config.target_platform == Platform.ANDROID: deps.append('stlport') - libtool_la = LibtoolLibrary('tag', 1, 7, None, self.config.libdir, deps) + libtool_la = LibtoolLibrary('tag', 1, 7, None, self.config.libdir, + self.config.target_platform, deps) libtool_la.save() shutil.move( os.path.join(self.config.prefix, 'lib', 'libtag_static.a'), diff --git a/recipes/zlib.recipe b/recipes/zlib.recipe index 3786e66f..a418d279 100644 --- a/recipes/zlib.recipe +++ b/recipes/zlib.recipe @@ -25,5 +25,6 @@ class Recipe(recipe.Recipe): self._remove_steps ([BuildSteps.CONFIGURE]) def post_install(self): - libtool_la = LibtoolLibrary('z', 1, 2, 7, self.config.libdir) + libtool_la = LibtoolLibrary('z', 1, 2, 7, self.config.libdir, + self.config.target_platform) libtool_la.save() |