summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-07-08 13:47:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 16:39:08 +0100
commitcd16591d6cb5d37d027ac16211904d4d7db3033e (patch)
tree6c0ad53370942ffd51d47f9c516f456d46e6d6a9
parent2a52b017f49e9d4699a94f2a8f7ef861526c4a1a (diff)
downloadpoky-cd16591d6cb5d37d027ac16211904d4d7db3033e.tar.gz
poky-cd16591d6cb5d37d027ac16211904d4d7db3033e.tar.bz2
poky-cd16591d6cb5d37d027ac16211904d4d7db3033e.zip
cmake: refactor recipe
* use INC_PR; * show configure's failure on error; * gather major version from PV; (From OE-Core rev: c9d1e68a137960b6cdc81b875c087a8c1031dcbc) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.3.bb4
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc6
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
index 29b3d87e88..a68a25f406 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.3.bb
@@ -1,7 +1,7 @@
-CMAKE_MAJOR_VERSION="2.8"
require cmake.inc
inherit native
-PR = "r1"
+
+PR = "${INC_PR}.1"
SRC_URI[md5sum] = "a76a44b93acf5e3badda9de111385921"
SRC_URI[sha256sum] = "689ed02786b5cefa5515c7716784ee82a82e8ece6be5a3d629ac3cc0c05fc288"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index eed93460ed..ec37a101a3 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -9,11 +9,15 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f372516292ff7c33337bf16a74a5f9a8 \
file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
+INC_PR = "r1"
+
+CMAKE_MAJOR_VERSION = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
+
SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://support-oe-qt4-tools-names.patch"
inherit autotools
do_configure () {
- ./configure --prefix=${prefix} || die "./bootstrap failed"
+ ./configure --prefix=${prefix}
}