Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
On Wed, May 5, 2021 at 3:21 PM Martin Jansa wrote: > It's actually from 2013, see: > > https://github.com/meta-qt5/meta-qt5/commit/671313d0b5e09e0b49a90ed944cd33fb3d6457b0 > > it had couple iterations in meta-qt5 before it was moved to oe-core in: > https://github.com/meta-qt5/meta-qt5/commit/17f240df > > http://git.openembedded.org/openembedded-core/commit/?h=daisy=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50 > as bunch of sed calls which were later changed to a .patch in 2018 > > http://git.openembedded.org/openembedded-core/commit/?id=9e58926f1cea9d5cb18cb923855d1ae98f88a8ac > > Now with RSS this shouldn't be so big issue, that rebuilding cmake-native > after qtbase-native won't suddenly detect Qt support for CMake, but it > should be tested on host with Qt5 installed to make sure it's not detected > from host and stays explicitly disabled (maybe there is a flag for that > nowadays - I didn't check in last 8 years :)). > Thanks for the context Martin I think host intrusion is a valid point although perhaps less of a chance > On Wed, May 5, 2021 at 10:52 PM Otavio Salvador < > otavio.salva...@ossystems.com.br> wrote: > >> Hello, >> >> Em qua., 5 de mai. de 2021 às 15:35, Khem Raj >> escreveu: >> > >> > before we remove it, lets hear a Review from Otavio and perhaps he has >> > better history with this patch >> > >> > On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin < >> alex.kana...@gmail.com> wrote: >> > > >> > > Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch >> > > (patch purpose and failing scenarios unclear; disabling >> > > is better done through configuration options which >> > > are available for all of these items). >> >> Try build it on a host with Qt to see if it fails. This is what comes >> to my mind. I don't recall the details as it was done in 2018 ... >> gosh, I am getting old. >> >> -- >> Otavio Salvador O.S. Systems >> http://www.ossystems.com.brhttp://code.ossystems.com.br >> Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151370): https://lists.openembedded.org/g/openembedded-core/message/151370 Mute This Topic: https://lists.openembedded.org/mt/82607021/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
It's actually from 2013, see: https://github.com/meta-qt5/meta-qt5/commit/671313d0b5e09e0b49a90ed944cd33fb3d6457b0 it had couple iterations in meta-qt5 before it was moved to oe-core in: https://github.com/meta-qt5/meta-qt5/commit/17f240df http://git.openembedded.org/openembedded-core/commit/?h=daisy=4f2dee0d8c2c3f60cb8f8021343e973cae31fc50 as bunch of sed calls which were later changed to a .patch in 2018 http://git.openembedded.org/openembedded-core/commit/?id=9e58926f1cea9d5cb18cb923855d1ae98f88a8ac Now with RSS this shouldn't be so big issue, that rebuilding cmake-native after qtbase-native won't suddenly detect Qt support for CMake, but it should be tested on host with Qt5 installed to make sure it's not detected from host and stays explicitly disabled (maybe there is a flag for that nowadays - I didn't check in last 8 years :)). On Wed, May 5, 2021 at 10:52 PM Otavio Salvador < otavio.salva...@ossystems.com.br> wrote: > Hello, > > Em qua., 5 de mai. de 2021 às 15:35, Khem Raj > escreveu: > > > > before we remove it, lets hear a Review from Otavio and perhaps he has > > better history with this patch > > > > On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin > wrote: > > > > > > Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch > > > (patch purpose and failing scenarios unclear; disabling > > > is better done through configuration options which > > > are available for all of these items). > > Try build it on a host with Qt to see if it fails. This is what comes > to my mind. I don't recall the details as it was done in 2018 ... > gosh, I am getting old. > > -- > Otavio Salvador O.S. Systems > http://www.ossystems.com.brhttp://code.ossystems.com.br > Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151367): https://lists.openembedded.org/g/openembedded-core/message/151367 Mute This Topic: https://lists.openembedded.org/mt/82607021/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
Hello, Em qua., 5 de mai. de 2021 às 15:35, Khem Raj escreveu: > > before we remove it, lets hear a Review from Otavio and perhaps he has > better history with this patch > > On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin > wrote: > > > > Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch > > (patch purpose and failing scenarios unclear; disabling > > is better done through configuration options which > > are available for all of these items). Try build it on a host with Qt to see if it fails. This is what comes to my mind. I don't recall the details as it was done in 2018 ... gosh, I am getting old. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#151355): https://lists.openembedded.org/g/openembedded-core/message/151355 Mute This Topic: https://lists.openembedded.org/mt/82607021/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 10/61] cmake: update 3.19.5 -> 3.20.1
before we remove it, lets hear a Review from Otavio and perhaps he has
better history with this patch
On Wed, May 5, 2021 at 8:19 AM Alexander Kanavin wrote:
>
> Remove 0002-cmake-Prevent-the-detection-of-Qt5.patch
> (patch purpose and failing scenarios unclear; disabling
> is better done through configuration options which
> are available for all of these items).
>
> License-Update: copyright years
>
> Signed-off-by: Alexander Kanavin
> ---
> ...ative_3.19.5.bb => cmake-native_3.20.1.bb} | 0
> meta/recipes-devtools/cmake/cmake.inc | 5 +-
> ...stem-use-oe-environment-vars-to-load.patch | 2 +-
> ...2-cmake-Prevent-the-detection-of-Qt5.patch | 122 --
> .../{cmake_3.19.5.bb => cmake_3.20.1.bb} | 0
> 5 files changed, 3 insertions(+), 126 deletions(-)
> rename meta/recipes-devtools/cmake/{cmake-native_3.19.5.bb =>
> cmake-native_3.20.1.bb} (100%)
> delete mode 100644
> meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
> rename meta/recipes-devtools/cmake/{cmake_3.19.5.bb => cmake_3.20.1.bb}
> (100%)
>
> diff --git a/meta/recipes-devtools/cmake/cmake-native_3.19.5.bb
> b/meta/recipes-devtools/cmake/cmake-native_3.20.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/cmake/cmake-native_3.19.5.bb
> rename to meta/recipes-devtools/cmake/cmake-native_3.20.1.bb
> diff --git a/meta/recipes-devtools/cmake/cmake.inc
> b/meta/recipes-devtools/cmake/cmake.inc
> index e0f59a6c67..2e6059f980 100644
> --- a/meta/recipes-devtools/cmake/cmake.inc
> +++ b/meta/recipes-devtools/cmake/cmake.inc
> @@ -10,19 +10,18 @@ HOMEPAGE = "http://www.cmake.org/;
> BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php;
> SECTION = "console/utils"
> LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM =
> "file://Copyright.txt;md5=c721f56fce89ba2eadc2fdd8ba1f4d83 \
> +LIC_FILES_CHKSUM =
> "file://Copyright.txt;md5=31023e1d3f51ca90a58f55bcee8e2339 \
>
> file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b
> \
> "
>
> CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
>
> SRC_URI =
> "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
> - file://0002-cmake-Prevent-the-detection-of-Qt5.patch \
>
> file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
>
> file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
> "
>
> -SRC_URI[sha256sum] =
> "c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce"
> +SRC_URI[sha256sum] =
> "3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0"
>
> UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar"
>
> diff --git
> a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
>
> b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
> index 8181510324..06e10bf861 100644
> ---
> a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
> +++
> b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
> @@ -1,4 +1,4 @@
> -From 66d5b27dc37ef6243f6549e16d0285ba6c064a6e Mon Sep 17 00:00:00 2001
> +From ac9b8d316ff3e013bc9d3c063db99aa1f064ce6a Mon Sep 17 00:00:00 2001
> From: Cody P Schafer
> Date: Thu, 27 Apr 2017 11:35:05 -0400
> Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load
> default
> diff --git
> a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
>
> b/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
> deleted file mode 100644
> index 33db07ccf0..00
> ---
> a/meta/recipes-devtools/cmake/cmake/0002-cmake-Prevent-the-detection-of-Qt5.patch
> +++ /dev/null
> @@ -1,122 +0,0 @@
> -From 98abade8cc119e076e4c5f1461c5188f6d49c1d8 Mon Sep 17 00:00:00 2001
> -From: Otavio Salvador
> -Date: Wed, 17 Jan 2018 10:02:14 -0200
> -Subject: [PATCH] cmake: Prevent the detection of Qt5
> -
> -Organization: O.S. Systems Software LTDA.
> -
> -CMake doesn't have dependency on qt4/qt5, so these tests usually fail
> -but still can cause undeterministic results or build failures (when
> -OE_QMAKE_PATH_EXTERNAL_HOST_BINS is undefined or native qmake removed
> -while running the test in cmake)
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Otavio Salvador
> -
>
> - Source/QtDialog/CMakeLists.txt | 2 +-
> - Tests/CMakeLists.txt | 2 +-
> - Tests/Qt4And5Automoc/CMakeLists.txt| 4 ++--
> - Tests/QtAutogen/AutogenGuiTest.cmake | 3 +--
> - Tests/QtAutogen/MacOsFW/CMakeLists.txt | 2 +-
> - Tests/RunCMake/CMakeLists.txt | 2 +-
> - Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake | 2 +-
> - 7 files changed, 8 insertions(+), 9
