diff options
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_2.8.5.bb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ec37a101a3..8433c533b7 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f372516292ff7c33337bf16a74a5f9a8 \ | |||
11 | 11 | ||
12 | INC_PR = "r1" | 12 | INC_PR = "r1" |
13 | 13 | ||
14 | CMAKE_MAJOR_VERSION = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" | 14 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" |
15 | 15 | ||
16 | SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 16 | SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
17 | file://support-oe-qt4-tools-names.patch" | 17 | file://support-oe-qt4-tools-names.patch" |
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb index 8e040728c9..3e2a218385 100644 --- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb +++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb | |||
@@ -13,8 +13,8 @@ SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aac | |||
13 | 13 | ||
14 | # Strip ${prefix} from ${docdir}, set result into docdir_stripped | 14 | # Strip ${prefix} from ${docdir}, set result into docdir_stripped |
15 | python () { | 15 | python () { |
16 | prefix=bb.data.getVar("prefix", d, 1) | 16 | prefix=d.getVar("prefix", 1) |
17 | docdir=bb.data.getVar("docdir", d, 1) | 17 | docdir=d.getVar("docdir", 1) |
18 | 18 | ||
19 | if not docdir.startswith(prefix): | 19 | if not docdir.startswith(prefix): |
20 | raise bb.build.FuncFailed('docdir must contain prefix as its prefix') | 20 | raise bb.build.FuncFailed('docdir must contain prefix as its prefix') |
@@ -23,7 +23,7 @@ python () { | |||
23 | if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': | 23 | if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': |
24 | docdir_stripped = docdir_stripped[1:] | 24 | docdir_stripped = docdir_stripped[1:] |
25 | 25 | ||
26 | bb.data.setVar("docdir_stripped", docdir_stripped, d) | 26 | d.setVar("docdir_stripped", docdir_stripped) |
27 | } | 27 | } |
28 | 28 | ||
29 | EXTRA_OECMAKE=" \ | 29 | EXTRA_OECMAKE=" \ |