summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-03-19 21:06:24 +0100
committerAndoni Morales Alastruey <ylatuya@gmail.com>2013-03-19 21:06:24 +0100
commit75a0d1935d8b642141331dc05c7a1ca968ac38bf (patch)
treedd6bbf50e86a01a81a47ab723f597728939649e3
parent4a91f308be242390186638ece60a89c4e929684b (diff)
build-tools: fix build of cmake gettext-tools and yasm
-rw-r--r--recipes/build-tools/cmake.recipe3
-rw-r--r--recipes/build-tools/gettext-tools.recipe1
-rw-r--r--recipes/build-tools/yasm.recipe4
3 files changed, 7 insertions, 1 deletions
diff --git a/recipes/build-tools/cmake.recipe b/recipes/build-tools/cmake.recipe
index ae97cef..acf17fe 100644
--- a/recipes/build-tools/cmake.recipe
+++ b/recipes/build-tools/cmake.recipe
@@ -5,6 +5,7 @@ class Recipe(recipe.Recipe):
name = 'cmake'
version = '2.8.10.2'
licenses = [License.BSD_like]
+ btype = BuildType.MAKEFILE
stype = SourceType.TARBALL
url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz'
deps = ['autoconf']
@@ -12,6 +13,6 @@ class Recipe(recipe.Recipe):
add_host_build_target = False
config_sh = './bootstrap'
configure_tpl = "%(config-sh)s --prefix=%(prefix)s"
+ can_use_configure_cache = False
files_bin = ['bin/cmake', 'bin/ccmake']
-
diff --git a/recipes/build-tools/gettext-tools.recipe b/recipes/build-tools/gettext-tools.recipe
index 9a5b4d1..ec16c50 100644
--- a/recipes/build-tools/gettext-tools.recipe
+++ b/recipes/build-tools/gettext-tools.recipe
@@ -17,3 +17,4 @@ class Recipe(recipe.Recipe):
def prepare(self):
if self.config.target_platform == Platform.WINDOWS:
self.configure_options += ' --enable-threads=win32'
+ self.append_env['LDFLAGS'] = '-liconv'
diff --git a/recipes/build-tools/yasm.recipe b/recipes/build-tools/yasm.recipe
index f3635ef..aa997dd 100644
--- a/recipes/build-tools/yasm.recipe
+++ b/recipes/build-tools/yasm.recipe
@@ -9,3 +9,7 @@ class Recipe(recipe.Recipe):
url = 'http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz'
files_bins = ['yasm']
+
+ def prepare(self):
+ if self.config.target_platform == Platform.WINDOWS:
+ self.append_env['LDFLAGS'] = '-lintl'