Commit 75a0d193 authored by Andoni Morales Alastruey's avatar Andoni Morales Alastruey
Browse files

build-tools: fix build of cmake gettext-tools and yasm

parent 4a91f308
...@@ -5,6 +5,7 @@ class Recipe(recipe.Recipe): ...@@ -5,6 +5,7 @@ class Recipe(recipe.Recipe):
name = 'cmake' name = 'cmake'
version = '2.8.10.2' version = '2.8.10.2'
licenses = [License.BSD_like] licenses = [License.BSD_like]
btype = BuildType.MAKEFILE
stype = SourceType.TARBALL stype = SourceType.TARBALL
url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz' url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz'
deps = ['autoconf'] deps = ['autoconf']
...@@ -12,6 +13,6 @@ class Recipe(recipe.Recipe): ...@@ -12,6 +13,6 @@ class Recipe(recipe.Recipe):
add_host_build_target = False add_host_build_target = False
config_sh = './bootstrap' config_sh = './bootstrap'
configure_tpl = "%(config-sh)s --prefix=%(prefix)s" configure_tpl = "%(config-sh)s --prefix=%(prefix)s"
can_use_configure_cache = False
files_bin = ['bin/cmake', 'bin/ccmake'] files_bin = ['bin/cmake', 'bin/ccmake']
...@@ -17,3 +17,4 @@ class Recipe(recipe.Recipe): ...@@ -17,3 +17,4 @@ class Recipe(recipe.Recipe):
def prepare(self): def prepare(self):
if self.config.target_platform == Platform.WINDOWS: if self.config.target_platform == Platform.WINDOWS:
self.configure_options += ' --enable-threads=win32' self.configure_options += ' --enable-threads=win32'
self.append_env['LDFLAGS'] = '-liconv'
...@@ -9,3 +9,7 @@ class Recipe(recipe.Recipe): ...@@ -9,3 +9,7 @@ class Recipe(recipe.Recipe):
url = 'http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz' url = 'http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz'
files_bins = ['yasm'] files_bins = ['yasm']
def prepare(self):
if self.config.target_platform == Platform.WINDOWS:
self.append_env['LDFLAGS'] = '-lintl'
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