Skip to contentSkip to conversation

cmake: 3.14.0 -> 3.14.1

PATCH In review Pascal Bach 2 participants 3 messages Apr 1, 2019 – Apr 3, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 .../cmake/{cmake-native_3.14.0.bb => cmake-native_3.14.1.bb}          | 0
 meta/recipes-devtools/cmake/cmake.inc                                 | 4 ++--
 meta/recipes-devtools/cmake/{cmake_3.14.0.bb => cmake_3.14.1.bb}      | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.14.0.bb => cmake-native_3.14.1.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.14.0.bb => cmake_3.14.1.bb} (100%)
meta/recipes-devtools/cmake/cmake-native_3.14.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.14.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.14.1.bb
meta/recipes-devtools/cmake/cmake.inc +2 -2
index f787851e2d..5b0bce6808 100644
@@ -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"
meta/recipes-devtools/cmake/cmake_3.14.1.bb renamed from meta/recipes-devtools/cmake/cmake_3.14.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.14.0.bb
rename to meta/recipes-devtools/cmake/cmake_3.14.1.bb
Signature · 1 line
2.11.0
#1 lore raw

This patch should also go into warrior as I think we should not ship 3.14.0 due to the issue mentioned bellow.

Quoted 53 lines

-----Original Message-----
From: Pascal Bach <[email protected]>
Sent: Montag, 1. April 2019 14:17
To: [email protected]
Cc: Bach, Pascal (BT CPS R&D ZG FW CCP) <[email protected]>
Subject: [PATCH] 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.

---
 .../cmake/{cmake-native_3.14.0.bb => cmake-native_3.14.1.bb}          | 0
 meta/recipes-devtools/cmake/cmake.inc                                 | 4 ++--
 meta/recipes-devtools/cmake/{cmake_3.14.0.bb => cmake_3.14.1.bb}      | 0
 3 files changed, 2 insertions(+), 2 deletions(-)  rename meta/recipes-

devtools/cmake/{cmake-native_3.14.0.bb => cmake-native_3.14.1.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.14.0.bb => cmake_3.14.1.bb} (100%)

meta/recipes-devtools/cmake/cmake-native_3.14.1.bb renamed from meta/recipes-devtools/cmake/cmake-native_3.14.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.14.0.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.14.1.bb
meta/recipes- renamed from meta/recipes-devtools/cmake/cmake.inc +0 -0

devtools/cmake/cmake.inc
index f787851e2d..5b0bce6808 100644

meta/recipes-devtools/cmake/cmake.inc +0 -0
@@ -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 \ "

meta/recipes-devtools/cmake/cmake.inc +0 -2
-SRC_URI[md5sum] = "7504e4f3e05b59e083f2127e07059d5d"
-SRC_URI[sha256sum] =

"aa76ba67b3c2af1946701f847073f4652af5cbd9f141f221c97af99127e75502"

meta/recipes-devtools/cmake/cmake.inc +2 -0
+SRC_URI[md5sum] = "7efe5394e85c3292ad020b8b70e55669"
+SRC_URI[sha256sum] =

"7321be640406338fc12590609c42b0fae7ea12980855c1be363d25dcd76bb25f"

UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"

meta/recipes- renamed from meta/recipes-devtools/cmake/cmake_3.14.0.bb +0 -0

devtools/cmake/cmake_3.14.1.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.14.0.bb rename to meta/recipes-devtools/cmake/cmake_3.14.1.bb --
2.11.0

#2 lore raw
Quoted 2 lines · Pascal

This patch should also go into warrior as I think we should not ship 3.14.0 due to the issue mentioned bellow.

Thanks, will queue this in warrior-next.

Cheers,

Richard