summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2019-04-01 14:16:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-04 22:57:00 +0100
commit6c85363eea0278a6952e80edb549e80e1fcbdba7 (patch)
treeb457cb38fde0986c26e17a1f092d78d8cfef3a1f
parent7a3f128b19e55b751e81bc676e5946544b0c8735 (diff)
downloadopenembedded-core-6c85363eea0278a6952e80edb549e80e1fcbdba7.tar.gz
cmake: 3.14.0 -> 3.14.1
The FindFontconfig module added by 3.14.0 accidentally used uppercase FONTCONFIG_* variable names that do not match our conventions. 3.14.1 revises the module to use Fontconfig_* variable names. This is incompatible with 3.14.0 but since the module is new in the 3.14 series usage should not yet be widespread. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.14.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.14.0.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc4
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.14.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.14.0.bb)0
3 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.14.0.bb b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb
index fedcf3d4bd..fedcf3d4bd 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index f787851e2d..5b0bce6808 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -18,7 +18,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
"
-SRC_URI[md5sum] = "7504e4f3e05b59e083f2127e07059d5d"
-SRC_URI[sha256sum] = "aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502"
+SRC_URI[md5sum] = "7efe5394e85c3292ad020b8b70e55669"
+SRC_URI[sha256sum] = "7321be640406338fc12590609c42b0fae7ea12980855c1be363d25dcd76bb25f"
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/cmake/cmake_3.14.0.bb b/meta/recipes-devtools/cmake/cmake_3.14.1.bb
index e0457677e8..e0457677e8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.14.0.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.14.1.bb