[oe-commits] org.oe.dev cmake: move definition of CMAKE_MAJOR_VERSION into python function in .inc

Laibsch commit oe at amethyst.openembedded.net
Tue Jun 24 08:12:29 UTC 2008


cmake: move definition of CMAKE_MAJOR_VERSION into python function in .inc
* no further changes across major versions necessary

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 7303fe991a5cd97a405ca4368e3d11f008634da1
ViewMTN: http://monotone.openembedded.org/revision/info/7303fe991a5cd97a405ca4368e3d11f008634da1
Files:
1
packages/cmake/cmake-native_2.4.8.bb
packages/cmake/cmake.inc
packages/cmake/cmake_2.4.8.bb
Diffs:

#
# mt diff -r84acd80eb1d19dd33d36053fe925482ca14af221 -r7303fe991a5cd97a405ca4368e3d11f008634da1
#
#
#
# patch "packages/cmake/cmake-native_2.4.8.bb"
#  from [e93af1577e83160d519fa02f84ead547fd2685f9]
#    to [106454cd890b36ee338a471786bd52864e0348da]
# 
# patch "packages/cmake/cmake.inc"
#  from [89da3b3a405a5fd27d0640e5dbbed1cfee521b7f]
#    to [342c5f01763ec602a7231d9b7a69e285c0684c55]
# 
# patch "packages/cmake/cmake_2.4.8.bb"
#  from [15b0b49ebb8470a51c6d1374f3871d8bd2d8b215]
#    to [4cede4a764ccc81e385ce3ba6accc31c2adb7ecb]
#
============================================================
--- packages/cmake/cmake-native_2.4.8.bb	e93af1577e83160d519fa02f84ead547fd2685f9
+++ packages/cmake/cmake-native_2.4.8.bb	106454cd890b36ee338a471786bd52864e0348da
@@ -1,4 +1,3 @@
-CMAKE_MAJOR_VERSION="2.4"
 require cmake.inc
 inherit native
 
============================================================
--- packages/cmake/cmake.inc	89da3b3a405a5fd27d0640e5dbbed1cfee521b7f
+++ packages/cmake/cmake.inc	342c5f01763ec602a7231d9b7a69e285c0684c55
@@ -6,6 +6,7 @@ SECTION = "console/utils"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
 
+CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
 
 inherit autotools
============================================================
--- packages/cmake/cmake_2.4.8.bb	15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
+++ packages/cmake/cmake_2.4.8.bb	4cede4a764ccc81e385ce3ba6accc31c2adb7ecb
@@ -1,2 +1 @@
-CMAKE_MAJOR_VERSION="2.4"
 require cmake.inc






More information about the Openembedded-commits mailing list