* [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0
@ 2022-11-22 9:42 Christian Melki
2022-11-23 6:55 ` Michael Olbrich
2022-12-05 12:53 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2022-11-22 9:42 UTC (permalink / raw)
To: ptxdist
Release notes, somewhat readable:
https://cmake.org/cmake/help/v3.24/release/3.24.html
https://cmake.org/cmake/help/v3.25/release/3.25.html
A bunch of changes, seems to build fine for me.
I found this one to be interesting:
https://cmake.org/cmake/help/v3.24/policy/CMP0132.html#policy:CMP0132
Changes to license files:
* Copyright.txt: Dates and versions, contributor list.
* Utilities/cmcurl/COPYING: Date changes.
* Utilities/cmzlib/Copyright.txt: Date and version changes.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/host-cmake.make | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/rules/host-cmake.make b/rules/host-cmake.make
index 44d43fbe5..305e90d87 100644
--- a/rules/host-cmake.make
+++ b/rules/host-cmake.make
@@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
#
# Paths and names
#
-HOST_CMAKE_VERSION := 3.23.1
-HOST_CMAKE_MD5 := b0d46fdcca030372f0a464146243e193
+HOST_CMAKE_VERSION := 3.25.0
+HOST_CMAKE_MD5 := a9d079eaf3f91ed9898834afb24e2b17
HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
HOST_CMAKE_SUFFIX := tar.gz
HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
@@ -24,18 +24,18 @@ HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
HOST_CMAKE_LICENSE_FILES := \
- file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \
+ file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \
file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \
file://Utilities/KWIML/Copyright.txt;md5=bdc657917a0eec5751b3d5eafd4b413c \
file://Utilities/cmbzip2/LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b \
- file://Utilities/cmcurl/COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b \
+ file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \
file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \
file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
- file://Utilities/cmzlib/Copyright.txt;md5=20549c31f1fec4df39b48732d8802c2a \
+ file://Utilities/cmzlib/Copyright.txt;md5=e08ebeaec41728215e9137e1d2b4d7cd \
file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0
2022-11-22 9:42 [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0 Christian Melki
@ 2022-11-23 6:55 ` Michael Olbrich
2022-12-05 8:29 ` Michael Olbrich
2022-12-05 12:53 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2022-11-23 6:55 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Tue, Nov 22, 2022 at 10:42:33AM +0100, Christian Melki wrote:
> Release notes, somewhat readable:
> https://cmake.org/cmake/help/v3.24/release/3.24.html
> https://cmake.org/cmake/help/v3.25/release/3.25.html
>
> A bunch of changes, seems to build fine for me.
> I found this one to be interesting:
> https://cmake.org/cmake/help/v3.24/policy/CMP0132.html#policy:CMP0132
>
> Changes to license files:
> * Copyright.txt: Dates and versions, contributor list.
> * Utilities/cmcurl/COPYING: Date changes.
> * Utilities/cmzlib/Copyright.txt: Date and version changes.
For some reason, building host-mariadb with this fails:
CMake Error at libmysql/CMakeLists.txt:289 (MESSAGE):
Your current linker does not support VERSION command in linker scripts like
a GNU ld or any compatible linker should. Perhaps you're using gold?
Either switch to GNU ld compatible linker or run cmake with
-DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=TRUE to be able to complete the
build
Not sure what happens here, as the toolchain is unchanged. I need to dig
into this before I can apply this patch.
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> rules/host-cmake.make | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/rules/host-cmake.make b/rules/host-cmake.make
> index 44d43fbe5..305e90d87 100644
> --- a/rules/host-cmake.make
> +++ b/rules/host-cmake.make
> @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
> #
> # Paths and names
> #
> -HOST_CMAKE_VERSION := 3.23.1
> -HOST_CMAKE_MD5 := b0d46fdcca030372f0a464146243e193
> +HOST_CMAKE_VERSION := 3.25.0
> +HOST_CMAKE_MD5 := a9d079eaf3f91ed9898834afb24e2b17
> HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
> HOST_CMAKE_SUFFIX := tar.gz
> HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> @@ -24,18 +24,18 @@ HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
> HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
> HOST_CMAKE_LICENSE_FILES := \
> - file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \
> + file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \
> file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \
> file://Utilities/KWIML/Copyright.txt;md5=bdc657917a0eec5751b3d5eafd4b413c \
> file://Utilities/cmbzip2/LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b \
> - file://Utilities/cmcurl/COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b \
> + file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \
> file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
> file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
> file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \
> file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
> file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
> file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
> - file://Utilities/cmzlib/Copyright.txt;md5=20549c31f1fec4df39b48732d8802c2a \
> + file://Utilities/cmzlib/Copyright.txt;md5=e08ebeaec41728215e9137e1d2b4d7cd \
> file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
>
>
> --
> 2.34.1
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0
2022-11-23 6:55 ` Michael Olbrich
@ 2022-12-05 8:29 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-12-05 8:29 UTC (permalink / raw)
To: Christian Melki, ptxdist
On Wed, Nov 23, 2022 at 07:55:10AM +0100, Michael Olbrich wrote:
> On Tue, Nov 22, 2022 at 10:42:33AM +0100, Christian Melki wrote:
> > Release notes, somewhat readable:
> > https://cmake.org/cmake/help/v3.24/release/3.24.html
> > https://cmake.org/cmake/help/v3.25/release/3.25.html
> >
> > A bunch of changes, seems to build fine for me.
> > I found this one to be interesting:
> > https://cmake.org/cmake/help/v3.24/policy/CMP0132.html#policy:CMP0132
> >
> > Changes to license files:
> > * Copyright.txt: Dates and versions, contributor list.
> > * Utilities/cmcurl/COPYING: Date changes.
> > * Utilities/cmzlib/Copyright.txt: Date and version changes.
>
> For some reason, building host-mariadb with this fails:
>
> CMake Error at libmysql/CMakeLists.txt:289 (MESSAGE):
> Your current linker does not support VERSION command in linker scripts like
> a GNU ld or any compatible linker should. Perhaps you're using gold?
> Either switch to GNU ld compatible linker or run cmake with
> -DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=TRUE to be able to complete the
> build
>
> Not sure what happens here, as the toolchain is unchanged. I need to dig
> into this before I can apply this patch.
The makes assumptions what the build directory for such compile checks is.
This changed in the new cmake version and a file was not found.
We don't need symbol versioning here, so I just disabled it. That code is
gone anyways in the latest mariadb version.
With that fixed I could merge the cmake update.
Michael
> > Signed-off-by: Christian Melki <christian.melki@t2data.com>
> > ---
> > rules/host-cmake.make | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/rules/host-cmake.make b/rules/host-cmake.make
> > index 44d43fbe5..305e90d87 100644
> > --- a/rules/host-cmake.make
> > +++ b/rules/host-cmake.make
> > @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
> > #
> > # Paths and names
> > #
> > -HOST_CMAKE_VERSION := 3.23.1
> > -HOST_CMAKE_MD5 := b0d46fdcca030372f0a464146243e193
> > +HOST_CMAKE_VERSION := 3.25.0
> > +HOST_CMAKE_MD5 := a9d079eaf3f91ed9898834afb24e2b17
> > HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
> > HOST_CMAKE_SUFFIX := tar.gz
> > HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> > @@ -24,18 +24,18 @@ HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> > HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
> > HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
> > HOST_CMAKE_LICENSE_FILES := \
> > - file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \
> > + file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \
> > file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \
> > file://Utilities/KWIML/Copyright.txt;md5=bdc657917a0eec5751b3d5eafd4b413c \
> > file://Utilities/cmbzip2/LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b \
> > - file://Utilities/cmcurl/COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b \
> > + file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \
> > file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
> > file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
> > file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \
> > file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
> > file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
> > file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
> > - file://Utilities/cmzlib/Copyright.txt;md5=20549c31f1fec4df39b48732d8802c2a \
> > + file://Utilities/cmzlib/Copyright.txt;md5=e08ebeaec41728215e9137e1d2b4d7cd \
> > file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
> >
> >
> > --
> > 2.34.1
> >
> >
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] host-cmake: Version bump 3.23.1 -> 3.25.0
2022-11-22 9:42 [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0 Christian Melki
2022-11-23 6:55 ` Michael Olbrich
@ 2022-12-05 12:53 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-12-05 12:53 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 9fc1adb2c35e681c7eb10107481a2e5023862088.
Michael
[sent from post-receive hook]
On Mon, 05 Dec 2022 13:53:58 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Release notes, somewhat readable:
> https://cmake.org/cmake/help/v3.24/release/3.24.html
> https://cmake.org/cmake/help/v3.25/release/3.25.html
>
> A bunch of changes, seems to build fine for me.
> I found this one to be interesting:
> https://cmake.org/cmake/help/v3.24/policy/CMP0132.html#policy:CMP0132
>
> Changes to license files:
> * Copyright.txt: Dates and versions, contributor list.
> * Utilities/cmcurl/COPYING: Date changes.
> * Utilities/cmzlib/Copyright.txt: Date and version changes.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221122094233.3576796-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-cmake.make b/rules/host-cmake.make
> index 44d43fbe56cf..305e90d87288 100644
> --- a/rules/host-cmake.make
> +++ b/rules/host-cmake.make
> @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
> #
> # Paths and names
> #
> -HOST_CMAKE_VERSION := 3.23.1
> -HOST_CMAKE_MD5 := b0d46fdcca030372f0a464146243e193
> +HOST_CMAKE_VERSION := 3.25.0
> +HOST_CMAKE_MD5 := a9d079eaf3f91ed9898834afb24e2b17
> HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
> HOST_CMAKE_SUFFIX := tar.gz
> HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> @@ -24,18 +24,18 @@ HOST_CMAKE_SOURCE := $(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
> HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
> HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
> HOST_CMAKE_LICENSE_FILES := \
> - file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \
> + file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \
> file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \
> file://Utilities/KWIML/Copyright.txt;md5=bdc657917a0eec5751b3d5eafd4b413c \
> file://Utilities/cmbzip2/LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b \
> - file://Utilities/cmcurl/COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b \
> + file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \
> file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
> file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
> file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \
> file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
> file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
> file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
> - file://Utilities/cmzlib/Copyright.txt;md5=20549c31f1fec4df39b48732d8802c2a \
> + file://Utilities/cmzlib/Copyright.txt;md5=e08ebeaec41728215e9137e1d2b4d7cd \
> file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-05 12:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-22 9:42 [ptxdist] [PATCH] host-cmake: Version bump 3.23.1 -> 3.25.0 Christian Melki
2022-11-23 6:55 ` Michael Olbrich
2022-12-05 8:29 ` Michael Olbrich
2022-12-05 12:53 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox