[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d79c854d65bf2e75385ee3b8a837954020add04

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d79c854d65bf2e75385ee3b8a837954020add04

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9d79c854d65bf2e75385ee3b8a837954020add04 (commit)
       via  fd6f02cf093a88e58e1d3707628f590a37273c80 (commit)
       via  569bea07f13dbec7a2e03e28c103f88ac204937d (commit)
       via  89e364df6690bca71adf2e33f4663c213f2eb2b7 (commit)
      from  4e4b53f5bbb03772b7d3a33450da89384322c775 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d79c854d65bf2e75385ee3b8a837954020add04
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Feb 18 11:49:39 2026 +0000

    ccache: Use the CMAKE macro
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit fd6f02cf093a88e58e1d3707628f590a37273c80
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Feb 18 11:49:27 2026 +0000

    blake3: Use the CMAKE macro
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 569bea07f13dbec7a2e03e28c103f88ac204937d
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Feb 18 11:49:12 2026 +0000

    oneTBB: Use the CMAKE macro
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 89e364df6690bca71adf2e33f4663c213f2eb2b7
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Feb 18 11:46:48 2026 +0000

    toolchain: Create a toolchain configuration file
    
    This is needed because we are currently cross-compiling the toolchain
    for riscv64 on x86_64. However, cmake does not take the time to figure
    out what it should actually be doing and needs to be explicitely told.
    
    So that we don't have to reinvent the wheel more than one we create the
    configuration file at the beginning and automatically extend the cmake
    command line with the settings that we need.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/Config |  8 ++++++++
 lfs/blake3 |  3 ++-
 lfs/ccache |  2 +-
 lfs/oneTBB |  2 +-
 lfs/stage1 | 11 +++++++++++
 5 files changed, 23 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/Config b/lfs/Config
index 8547f69c6..56754f299 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -130,6 +130,14 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	GRUB_ARCH = arm64
 endif
 
+CMAKE = cmake
+
+# In the toolchain, we might be cross-compiling and need cmake to know
+ifeq "$(TOOLCHAIN)" "1"
+	CMAKE += \
+		-D CMAKE_TOOLCHAIN_FILE=$(TOOLS_DIR)/share/cmake/toolchain.cmake
+endif
+
 # Go
 export GOARCH
 export GOOS   = linux
diff --git a/lfs/blake3 b/lfs/blake3
index aade50bb1..6e13f9636 100644
--- a/lfs/blake3
+++ b/lfs/blake3
@@ -70,8 +70,9 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
 	cd $(DIR_APP)/c && mkdir -pv build
-	cd $(DIR_APP)/c/build && cmake \
+	cd $(DIR_APP)/c/build && $(CMAKE) \
 				-D CMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \
 				-D BUILD_SHARED_LIBS=TRUE \
 				..
diff --git a/lfs/ccache b/lfs/ccache
index b0d6da4d1..6771d960e 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && mkdir -pv build
-	cd $(DIR_APP)/build && cmake \
+	cd $(DIR_APP)/build && $(CMAKE) \
 				-D CMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \
 				-D CMAKE_INCLUDE_PATH=$(TOOLS_DIR)/include \
 				-D ENABLE_TESTING=OFF \
diff --git a/lfs/oneTBB b/lfs/oneTBB
index e6720d280..1069e141c 100644
--- a/lfs/oneTBB
+++ b/lfs/oneTBB
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && mkdir -pv build
-	cd $(DIR_APP)/build && cmake \
+	cd $(DIR_APP)/build && $(CMAKE) \
 				-D CMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \
 				-D TBB_TEST=FALSE \
 				..
diff --git a/lfs/stage1 b/lfs/stage1
index 2f8db61a1..1d289abbe 100644
--- a/lfs/stage1
+++ b/lfs/stage1
@@ -55,4 +55,15 @@ ifeq "$(BUILD_ARCH)" "riscv64"
 	ln -svf . $(TOOLS_DIR)/lib/lp64d
 endif
 
+	# Write a cmake toolchain file so cmake knows we're targeting $(BUILD_ARCH)
+	-mkdir -pv $(TOOLS_DIR)/share/cmake
+	echo "set(CMAKE_SYSTEM_NAME      Linux)" > \
+		$(TOOLS_DIR)/share/cmake/toolchain.cmake
+	echo "set(CMAKE_SYSTEM_PROCESSOR $(BUILD_ARCH))" >> \
+		$(TOOLS_DIR)/share/cmake/toolchain.cmake
+	echo "set(CMAKE_C_COMPILER       $(TOOLS_DIR)/bin/cc)"  >> \
+		$(TOOLS_DIR)/share/cmake/toolchain.cmake
+	echo "set(CMAKE_CXX_COMPILER     $(TOOLS_DIR)/bin/c++)" >> \
+		$(TOOLS_DIR)/share/cmake/toolchain.cmake
+
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree