package/ccache: bump version
cover package/ccache: bump version
---- 8< ----/tmp/ccmQFw5y.s: Assembler messages:/tmp/ccmQFw5y.s:89386: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:89400: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:89464: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:89518: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:89525: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:123938: Error: unsupported instruction `vmovdqu'/tmp/ccmQFw5y.s:123953: Error: unsupported instruction `vmovdqu'
make[4]: *** [src/third_party/blake3/CMakeFiles/blake3.dir/build.make:160: src/third_party/blake3/CMakeFiles/blake3.dir/blake3_avx512.c.o] Error 1 make[3]: *** [CMakeFiles/Makefile2:406: src/third_party/blake3/CMakeFiles/blake3.dir/all] Error 2
---- 8< ----
To solve the problem above I started bumping the ccache package to 4.10.1. While doing this I observed the problem that ccache tries to download xxhash by its own and fails.
---- 8< ----
-- Downloading...
dst='/srv/storage/hthiery/buildroot-2/output/build/host-ccache-4.10.1/_deps/xxhash-subbuild/xxhash-populate-prefix/src/v0.8.2.tar.gz' timeout='none'
inactivity timeout='none'
-- Using src='https://github.com/Cyan4973/xxhash/archive/refs/tags/v0.8.2.tar.gz'
CMake Error at xxhash-subbuild/xxhash-populate-prefix/src/xxhash-populate-stamp/download-xxhash-populate.cmake:170 (message):
Each download failed!
error: downloading 'https://github.com/Cyan4973/xxhash/archive/refs/tags/v0.8.2.tar.gz' failed
status_code: 1
status_string: "Unsupported protocol"
log:
--- LOG BEGIN ---
Protocol "https" not supported or disabled in libcurl
Closing connection
--- LOG END ---
---- 8< ----
So I added support for the host package of xxhash and added this to the ccache dependencies.
In addition the bundled blake3 version seems not to build correctly on all machines. See the first error about 'unsupported instruction'. Therefore the new host package for blake3 is introduced.
v2:
- change subject (fixed naming from ccmake to ccache)
v3:
- fix legal-info for ccache and blake3
Heiko Thiery (3):
package/blake3: add new host package
package/xxhash: add host support
package/ccache: bump version to 4.10.1
package/blake3/blake3.hash | 6 ++++++ package/blake3/blake3.mk | 22 ++++++++++++++++++++++ package/ccache/ccache.hash | 2 +- package/ccache/ccache.mk | 16 ++++++++-------- package/pkg-generic.mk | 2 +- package/xxhash/xxhash.mk | 18 ++++++++++++++++++ 6 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 package/blake3/blake3.hash create mode 100644 package/blake3/blake3.mk
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 1/3 package/blake3: add new host package
This package is used and required for ccache update.
---
v2:
- on change
v3:
- fix BLAKE3_LICENSE_FILES and corresponding hash values
DEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 package/blake3/blake3.hash create mode 100644 package/blake3/blake3.mk
DEVELOPERS +1 -0
@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/
package/blake3/blake3.hash new file +3 -0
@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSE
package/blake3/blake3.mk new file +20 -0
@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################ + +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION)) +BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Hi Heiko,
Quoted 46 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +0
-0
package/blake3/blake3.mk line 8
Quoted 8 lines
package/blake3/blake3.mk new file +8
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################ + +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))
Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...
package/blake3/blake3.mk line 16
Quoted 8 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \
Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.
Regards,
Arnout
package/blake3/blake3.mk line 20
Quoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Hi,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 79 lines
Hi Heiko,
Quoted 46 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +0
-0package/blake3/blake3.mk line 8
Quoted 8 lines
package/blake3/blake3.mk new file +8
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################ + +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...package/blake3/blake3.mk line 16
Quoted 8 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...
Quoted 3 lines
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.
ok, I will recheck the things you mentioned and come back with info/respin at the weekend.
Thanks
--
Heiko
Quoted 8 lines
Regards,
ArnoutQuoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
In reply to Arnout Vandecappelle via buildrootHi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 55 lines
Hi Heiko,
Quoted 51 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +5
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################
Quoted 8 lines
package/blake3/blake3.mk line 8
Quoted 3 lines
package/blake3/blake3.mk new file +3
-0+ +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...
You are right. I changed it to:BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION))
I think this is what you expect.
Quoted 14 lines
package/blake3/blake3.mk line 16
Quoted 9 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...
When not defining that I got the errror:
[ 25%] Building C object CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM object CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o [ 50%] Building C object CMakeFiles/blake3.dir/blake3_dispatch.c.o Assembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM object CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o Assembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2
So when changing to use gcc instead of as it works.
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
Signature · 1 line
Heiko
Quoted 12 lines
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.Regards,
ArnoutQuoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Quoted 8 lines · Heiko Thiery
Hi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 4 lines
Hi Heiko,
On 04/07/2024 14:34, Heiko Thiery wrote:
[snip]
Quoted 35 lines
Quoted 7 lines
package/blake3/blake3.mk line 16
Quoted 2 lines
package/blake3/blake3.mk new file +2
-0+HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...When not defining that I got the errror:
[ 25%] Building C object
CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o[ 50%] Building C objectCMakeFiles/blake3.dir/blake3_dispatch.c.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2
Quoted 5 lines
So when changing to use gcc instead of as it works.
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
Hah, indeed, our setting of CMAKE_ASM_COMPILER is incorrect in pkg-cmake.mk.
That's why it also had to be overridden in llvm.mk. Also, we don't have such a definition for the target, which makes me think that by default it just uses CMAKE_C_COMPILER (which is exactly what we want here).
Could you try to remove the definition from pkg-cmake.mk and see if that
works? And then also remove it in llvm.mk. In separate patches, of course.
Regards,
Arnout
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Hi,
Am Fr., 12. Juli 2024 um 21:21 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 55 lines · Heiko Thiery
Quoted 8 lines
Hi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 4 lines
Hi Heiko,
On 04/07/2024 14:34, Heiko Thiery wrote:
[snip]
Quoted 35 lines
Quoted 7 lines
package/blake3/blake3.mk line 16
Quoted 2 lines
package/blake3/blake3.mk new file +2
-0+HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...When not defining that I got the errror:
[ 25%] Building C object
CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o[ 50%] Building C objectCMakeFiles/blake3.dir/blake3_dispatch.c.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2Quoted 5 lines
So when changing to use gcc instead of as it works.
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
Quoted 7 lines
Hah, indeed, our setting of
CMAKE_ASM_COMPILERis incorrect in pkg-cmake.mk.
That's why it also had to be overridden in llvm.mk. Also, we don't have such a definition for the target, which makes me think that by default it just usesCMAKE_C_COMPILER(which is exactly what we want here).Could you try to remove the definition from pkg-cmake.mk and see if that
works? And then also remove it in llvm.mk. In separate patches, of course.
Indeed, when removing the CMAKE_ASM_COMPILER from pkg-cmake.pkg the blake3 and llvm package build without the need of setting ASM to gcc.
I will create a patch for that (pkg-cmake and llvm). But only i can't explain exactly why the setting
in pkg-cmake is wrong. it would be good if you could improve the commit message accordingly.
Signature · 1 line
Heiko
Quoted 4 lines
Regards,
Arnout
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
In reply to Heiko ThieryHi Arnout,
Am Fr., 12. Juli 2024 um 21:08 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 116 lines
Hi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 55 lines
Hi Heiko,
Quoted 51 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +5
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################Quoted 8 lines
package/blake3/blake3.mk line 8
Quoted 3 lines
package/blake3/blake3.mk new file +3
-0+ +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...You are right. I changed it to:
BLAKE3_SITE= $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION))I think this is what you expect.
Quoted 14 lines
package/blake3/blake3.mk line 16
Quoted 9 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...When not defining that I got the errror:
[ 25%] Building C object
CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o[ 50%] Building C objectCMakeFiles/blake3.dir/blake3_dispatch.c.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2
Quoted 5 lines
So when changing to use gcc instead of as it works.
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
But unsetting -UCMAKE_C_COMPILER_LAUNCHER and -UCMAKE_CXX_COMPILER_LAUNCHE is not required. So would remove these two lines.
Quoted 16 lines
--
HeikoQuoted 12 lines
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.Regards,
ArnoutQuoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Quoted 122 lines · Heiko Thiery
Hi Arnout,
Am Fr., 12. Juli 2024 um 21:08 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 118 lines
Hi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 55 lines
Hi Heiko,
Quoted 51 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +5
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################Quoted 8 lines
package/blake3/blake3.mk line 8
Quoted 3 lines
package/blake3/blake3.mk new file +3
-0+ +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...You are right. I changed it to:
BLAKE3_SITE= $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION))I think this is what you expect.
Quoted 14 lines
package/blake3/blake3.mk line 16
Quoted 9 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...When not defining that I got the errror:
[ 25%] Building C object
CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o[ 50%] Building C objectCMakeFiles/blake3.dir/blake3_dispatch.c.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2So when changing to use gcc instead of as it works.
Quoted 7 lines
Quoted 3 lines
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
But unsetting -UCMAKE_C_COMPILER_LAUNCHER and -UCMAKE_CXX_COMPILER_LAUNCHE is not required. So would remove these two lines.
Huh? Those two are still needed because blake3 is a dependency of ccache so
you can't build it with ccache as the launcher...
Regards,
Arnout
Quoted 10 lines
Quoted 10 lines
--
HeikoQuoted 5 lines
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Regards,
ArnoutQuoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 1/3] package/blake3: add new host package
Am Fr., 12. Juli 2024 um 21:56 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 130 lines · Heiko Thiery
Quoted 126 lines
Hi Arnout,
Am Fr., 12. Juli 2024 um 21:08 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 121 lines
Hi Arnout,
Am Fr., 12. Juli 2024 um 10:38 Uhr schrieb Arnout Vandecappelle <[email protected]>:
Quoted 55 lines
Hi Heiko,
Quoted 51 lines · Heiko Thiery
This package is used and required for ccache update.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- on changev3:
- fixBLAKE3_LICENSE_FILESand corresponding hash valuesDEVELOPERS | 1 + package/blake3/blake3.hash | 3 +++ package/blake3/blake3.mk | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+)create mode 100644 package/blake3/blake3.hash
create mode 100644package/blake3/blake3.mkDEVELOPERS +1
-0@@ -1359,6 +1359,7 @@ F: configs/kontron_bl_imx8mm_defconfig F: configs/kontron_smarc_sal28_defconfig F: configs/kontron_pitx_imx8m_defconfig F: package/altera-stapl/ +F: package/blake3/ F: package/ipmitool/ F: package/libnetconf2/ F: package/libyang/package/blake3/blake3.hash new file +3
-0@@ -0,0 +1,3 @@ +# sha256 computed locally +sha256 822cd37f70152e5985433d2c50c8f6b2ec83aaf11aa31be9fe71486a91744f37 blake3-1.5.1.tar.gz +sha256 6a94bedb8b707ed97f6e310d0d015ab14e0683ffa0a612b02958581b9cc9fc0e LICENSEpackage/blake3/blake3.mk new file +5
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# blake3 +# +################################################################################Quoted 8 lines
package/blake3/blake3.mk line 8
Quoted 3 lines
package/blake3/blake3.mk new file +3
-0+ +BLAKE3_VERSION = 1.5.1 +BLAKE3_SITE = $(call github,BLAKE3-team,BLAKE3,refs/tags/$(BLAKE3_VERSION))Why do you put the refs/tags here? It was necessary in one or two packages
because of a conflict with a branch name, but I don't think that's the case here. I admit that there's a certain elegance to making it explicit that we want a tag, but then we really should be doing that everywhere...You are right. I changed it to:
BLAKE3_SITE= $(call github,BLAKE3-team,BLAKE3,$(BLAKE3_VERSION))I think this is what you expect.
Quoted 14 lines
package/blake3/blake3.mk line 16
Quoted 9 lines
package/blake3/blake3.mk new file +8
-0+BLAKE3_SUBDIR = c +BLAKE3_LICENSE = Apache-2.0, CC0-1.0 +BLAKE3_LICENSE_FILES = LICENSE + +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_BLAKE3_CONF_OPTS += \ + -DCMAKE_ASM_COMPILER="$(CMAKE_HOST_C_COMPILER)" \Why is this needed? And is it even a good idea? In pkg-cmake, this is defined
as -DCMAKE_ASM_COMPILER="$$(HOSTAS)", and HOSTAS is simply "as" without any ccache. In fact, this changes it from "as" to "gcc" which I expect is not correct at all...When not defining that I got the errror:
[ 25%] Building C object
CMakeFiles/blake3.dir/blake3_portable.c.o
[ 37%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o[ 50%] Building C objectCMakeFiles/blake3.dir/blake3_dispatch.c.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:117:CMakeFiles/blake3.dir/blake3_avx2_x86-64_unix.S.o] Error 1
make[3]: *** Waiting for unfinished jobs....
[ 62%] Building ASM objectCMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.oAssembler messages:
Fatal error: bad defsym; format is --defsym name=value
make[3]: *** [CMakeFiles/blake3.dir/build.make:130:CMakeFiles/blake3.dir/blake3_avx512_x86-64_unix.S.o] Error 1
make[3]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[2]: *** [CMakeFiles/Makefile2:83: CMakeFiles/blake3.dir/all] Error 2 make[2]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c' make[1]: *** [Makefile:136: all] Error 2
make[1]: Leaving directory '/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/c'
make: *** [package/pkg-generic.mk:283:/home/hthiery/sources/mainline/buildroot/output/build/host-blake3-1.5.1/.stamp_built] Error 2So when changing to use gcc instead of as it works.
I tried to build on my host and see that cmake sets the var "CMAKE_ASM_COMPILER=/usr/bin/cc". When overwriting it with as it also does not build.
Quoted 6 lines
Quoted 3 lines
But unsetting -UCMAKE_C_COMPILER_LAUNCHER and -UCMAKE_CXX_COMPILER_LAUNCHE is not required. So would remove these two lines.
Huh? Those two are still needed because blake3 is a dependency of ccache so
you can't build it with ccache as the launcher...
Ah yes .. I just build host-blake3 without ccache enabled for testing my changes. So I will retest that ;-/
Thanks
Quoted 21 lines
Regards,
ArnoutQuoted 17 lines
Quoted 17 lines
--
HeikoQuoted 12 lines
Since you said you could respin this weekend, I will mark as Changes
Requested, but it's possible that your respin only has some commit message changes of course.Regards,
ArnoutQuoted 4 lines
package/blake3/blake3.mk new file +4
-0+ -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + +$(eval $(host-cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 2/3 package/xxhash: add host support
In reply to Heiko ThieryThe host support is required for ccmake
--- package/xxhash/xxhash.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
package/xxhash/xxhash.mk +18 -0
@@ -15,6 +15,10 @@ XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ install_libxxhash.pc \ install_xxhsum +HOST_XXHASH_INSTALL_TARGETS = \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a
@@ -41,4 +45,18 @@ define XXHASH_INSTALL_TARGET_CMDS PREFIX=/usr DESTDIR=$(TARGET_DIR) $(XXHASH_INSTALL_TARGETS) endef +# we are a ccache dependency, so we can't use ccache +HOST_XXHASH_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" +HOST_XXHASH_OPTS += DESTDIR=$(HOST_DIR) PREFIX=/usr + +define HOST_XXHASH_BUILD_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) +endef + +define HOST_XXHASH_INSTALL_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) \ + $(HOST_XXHASH_INSTALL_TARGETS) +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 2/3] package/xxhash: add host support
Quoted 12 lines · Heiko Thiery
The host support is required for ccmake
Signed-off-by Heiko Thiery <[email protected]>--- package/xxhash/xxhash.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)package/xxhash/xxhash.mk +0
-0
package/xxhash/xxhash.mk XXHASH_INSTALL_TARGETS = \ · line 21
Quoted 7 lines
package/xxhash/xxhash.mk +4
-0@@ -15,6 +15,10 @@ XXHASH_INSTALL_TARGETS = \ install_libxxhash.includes \ install_libxxhash.pc \ install_xxhsum +HOST_XXHASH_INSTALL_TARGETS = \ + install_libxxhash \ + install_libxxhash.includes \ + install_libxxhash.pc
I think we only need these separate install targets because for the target we
need to handle shared/static libs. For the host, we don't care, so we can just use 'make install' I think.
package/xxhash/xxhash.mk define XXHASH_INSTALL_TARGET_CMDS · line 50
Quoted 10 lines
package/xxhash/xxhash.mk +3
-0ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) XXHASH_TARGETS += libxxhash.a@@ -41,4 +45,18 @@ define XXHASH_INSTALL_TARGET_CMDS PREFIX=/usr DESTDIR=$(TARGET_DIR) $(XXHASH_INSTALL_TARGETS) endef +# we are a ccache dependency, so we can't use ccache +HOST_XXHASH_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" +HOST_XXHASH_OPTS += DESTDIR=$(HOST_DIR) PREFIX=/usr
For host installation, there should be no DESTDIR and it should be
PREFIX=$(HOST_DIR) (without /usr).
Regards,
Arnout
package/xxhash/xxhash.mk define XXHASH_INSTALL_TARGET_CMDS · line 62
Quoted 12 lines
package/xxhash/xxhash.mk +11
-0+ +define HOST_XXHASH_BUILD_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) +endef + +define HOST_XXHASH_INSTALL_CMDS + $(HOST_XXHASH_ENV) $(MAKE) $(HOST_XXHASH_OPTS) -C $(@D) \ + $(HOST_XXHASH_INSTALL_TARGETS) +endef + $(eval $(generic-package)) +$(eval $(host-generic-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v3 3/3 package/ccache: bump version to 4.10.1
In reply to Heiko Thieryhttps://ccache.dev/releasenotes.html#_ccache_4_10_1
This version requires use the system dependencies of host-blake3 and host-xxhash. The bundled version is not able to build/download.
The ZSTD_FROM_INTERNET and HIREDIS_FROM_INTERNET variables are replaced in the ccache build system with DEP_ZSTD and DEP_HIREDIS in version 4.10. For the sake of completeness, all DEP_<xxx> variables were set for external dependencies.
The generation of documentation has also been switched off.
---
v2:
- cleanup HOST_CCACHE_CONF_OPTS
v3:
- adopt LICENSE.adoc hash
package/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 27 +++++++++++++++++---------- package/pkg-generic.mk | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-)
package/ccache/ccache.hash +2 -2
@@ -1,4 +1,4 @@ # sha256 computed locally -sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz +sha256 3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6 ccache-4.10.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc +sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc
package/ccache/ccache.mk +17 -10
@@ -4,20 +4,27 @@ # ################################################################################ -CCACHE_VERSION = 4.9.1 +CCACHE_VERSION = 4.10.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt -HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd host-xxhash host-blake3 # We are ccache, so we can't use ccache HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DCCACHE_DEV_MODE=OFF \ - -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF \ + -DDEP_BLAKE3=SYSTEM \ + -DDEP_FMT=BUNDLED \ + -DDEP_CPPHTTPLIB=BUNDLED \ + -DDEP_HIREDIS=SYSTEM \ + -DDEP_NONSTDSPAN=BUNDLED \ + -DDEP_TLEXPECTED=BUNDLED \ + -DDEP_XXHASH=SYSTEM \ + -DDEP_ZSTD=SYSTEM \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_TESTING=OFF # Patch host-ccache as follows:
@@ -32,12 +39,12 @@ HOST_CCACHE_CONF_OPTS += \ HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp - sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
package/pkg-generic.mk +1 -1
@@ -793,7 +793,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd host-xxhash host-blake3,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif
Signature · 6 lines
2.39.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH v3 3/3] package/ccache: bump version to 4.10.1
Quoted 31 lines · Heiko Thiery
https://ccache.dev/releasenotes.html#_ccache_4_10_1
This version requires use the system dependencies of host-blake3 and host-xxhash. The bundled version is not able to build/download.
The
ZSTD_FROM_INTERNETandHIREDIS_FROM_INTERNETvariables are replaced in the ccache build system withDEP_ZSTDandDEP_HIREDISin version 4.10. For the sake of completeness, all DEP_<xxx> variables were set for external dependencies.The generation of documentation has also been switched off.
Signed-off-by Heiko Thiery <[email protected]>---
v2:
- cleanupHOST_CCACHE_CONF_OPTSv3:
- adopt LICENSE.adoc hashpackage/ccache/ccache.hash | 4 ++-- package/ccache/ccache.mk | 27 +++++++++++++++++---------- package/pkg-generic.mk | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-)package/ccache/ccache.hash +0
-0
package/ccache/ccache.hash line 4
Quoted 6 lines
package/ccache/ccache.hash +2
-2@@ -1,4 +1,4 @@ # sha256 computed locally -sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz +sha256 3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6 ccache-4.10.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc +sha256 de4684f5251a0a2c58f3a7ab94d6a8d3443822cbd01abcdadd9250d3d1e0bfe1 LICENSE.adoc
Commit message should explain why the hash changed, i.e. what are the
differences between the old and the new license. Preferably with a reference to the upstream commit(s) that introduced the change.
Quoted 60 lines
package/ccache/ccache.mk +17
-10@@ -4,20 +4,27 @@ # ################################################################################ -CCACHE_VERSION = 4.9.1 +CCACHE_VERSION = 4.10.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others CCACHE_LICENSE_FILES = LICENSE.adoc GPL-3.0.txt -HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd host-xxhash host-blake3 # We are ccache, so we can't use ccache HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DCCACHE_DEV_MODE=OFF \ - -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF \ + -DDEP_BLAKE3=SYSTEM \ + -DDEP_FMT=BUNDLED \ + -DDEP_CPPHTTPLIB=BUNDLED \ + -DDEP_HIREDIS=SYSTEM \ + -DDEP_NONSTDSPAN=BUNDLED \ + -DDEP_TLEXPECTED=BUNDLED \ + -DDEP_XXHASH=SYSTEM \ + -DDEP_ZSTD=SYSTEM \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_TESTING=OFF # Patch host-ccache as follows:@@ -32,12 +39,12 @@ HOST_CCACHE_CONF_OPTS += \ HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp - sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp - sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/ccache/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATIONpackage/pkg-generic.mk +0
-0
package/pkg-generic.mk $(2)_EXTRACT_DEPENDENCIES += \ · line 796
Quoted 5 lines
package/pkg-generic.mk +1
-1@@ -793,7 +793,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd host-xxhash host-blake3,$(1)),)
Wow, this is getting impressive... Perhaps we should turn this around and use
a variable FOO_ADD_CCACHE_DEPENDENCY, similar to the FOO_ADD_TOOLCHAIN_DEPENDENCY we already have?
Regards,
Arnout
package/pkg-generic.mk $(2)_EXTRACT_DEPENDENCIES += \ · line 799
Quoted 3 lines
package/pkg-generic.mk +0
-0$(2)_DEPENDENCIES += host-ccache endif endif
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot