From: Alexander Kanavin Date: Fri, 28 Aug 2015 12:18:57 +0000 (+0300) Subject: cmake: update to 3.3.1 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29150 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8292eba3c79ffcdebd23cbabc9975c7a4075dba6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cmake: update to 3.3.1 Share tarball checksums between cmake and cmake-native via cmake.inc. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb similarity index 72% rename from meta/recipes-devtools/cmake/cmake-native_3.2.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.3.1.bb index 17e9e2c1c44..cb4e749d7a5 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.2.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.3.1.bb @@ -8,9 +8,6 @@ SRC_URI += "\ file://cmlibarchive-disable-ext2fs.patch \ " -SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - # Disable ccmake since we don't depend on ncurses CMAKE_EXTRACONF = "\ -DBUILD_CursesDialog=0 \ diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index d1cb7abe06f..57e93ac070e 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -16,6 +16,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz file://qt4-fail-silent.patch \ " +SRC_URI[md5sum] = "52638576f4e1e621fed6c3410d3a1b12" +SRC_URI[sha256sum] = "cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6" + inherit autotools # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable diff --git a/meta/recipes-devtools/cmake/cmake_3.2.2.bb b/meta/recipes-devtools/cmake/cmake_3.3.1.bb similarity index 92% rename from meta/recipes-devtools/cmake/cmake_3.2.2.bb rename to meta/recipes-devtools/cmake/cmake_3.3.1.bb index 4765f6c20c8..2f188f07127 100644 --- a/meta/recipes-devtools/cmake/cmake_3.2.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.3.1.bb @@ -8,9 +8,6 @@ SRC_URI_append_class-nativesdk = " \ file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh" -SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" -SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" - # Strip ${prefix} from ${docdir}, set result into docdir_stripped python () { prefix=d.getVar("prefix", True)