From 0e60561d7766c4078e3986130ce4360b76e1fa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 6 Apr 2025 14:11:51 -0400
Subject: [PATCH] contrib: always depend on toolchain.cmake when using cmake

Change-Id: I99f4194635d6a2cf26a4cef58880c947817d6909
---
 contrib/src/libarchive/rules.mak | 2 +-
 contrib/src/llhttp/rules.mak     | 6 +++---
 contrib/src/opendht/rules.mak    | 2 +-
 contrib/src/restinio/rules.mak   | 2 +-
 contrib/src/yaml-cpp/rules.mak   | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index ebbb801802..7483293fe4 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -28,7 +28,7 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive
 	$(UNPACK)
 	$(MOVE)
 
-.libarchive: libarchive toolchain.cmake
+.libarchive: libarchive toolchain.cmake .sum-libarchive
 	cd $< && mkdir -p buildlib
 ifdef HAVE_ANDROID
 	cd $< && cp -R contrib/android/include/* $(PREFIX)/include
diff --git a/contrib/src/llhttp/rules.mak b/contrib/src/llhttp/rules.mak
index 3bec129792..1d992e078a 100644
--- a/contrib/src/llhttp/rules.mak
+++ b/contrib/src/llhttp/rules.mak
@@ -30,9 +30,9 @@ llhttp: llhttp-$(LLHTTP_VERSION).tar.gz
 	$(UNPACK)
 	mv llhttp-release-v$(LLHTTP_VERSION) $@
 
-.llhttp: llhttp .sum-llhttp
+.sum-llhttp: llhttp-$(LLHTTP_VERSION).tar.gz
+
+.llhttp: llhttp toolchain.cmake .sum-llhttp
 	cd $< && mkdir -p build && cd build && $(HOSTVARS) $(CMAKE) $(LLHTTP_CMAKECONF) ..
 	cd $</build && $(MAKE) && $(MAKE) install
 	touch $@
-
-.sum-llhttp: llhttp-$(LLHTTP_VERSION).tar.gz
diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak
index f1c302fc9b..772558e925 100644
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
@@ -28,7 +28,7 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz
 	$(UNPACK)
 	$(MOVE)
 
-.opendht: opendht .sum-opendht
+.opendht: opendht toolchain.cmake .sum-opendht
 	cd $< && mkdir -p build
 	cd $< && cd build && $(HOSTVARS) $(CMAKE) $(OPENDHT_CONF) ..
 	cd $< && cd build && $(MAKE) install
diff --git a/contrib/src/restinio/rules.mak b/contrib/src/restinio/rules.mak
index dd61083139..0150090468 100644
--- a/contrib/src/restinio/rules.mak
+++ b/contrib/src/restinio/rules.mak
@@ -41,7 +41,7 @@ restinio: restinio-$(RESTINIO_VERSION).tar.bz2 expected.hpp
 	mkdir -p $(PREFIX)/include/nonstd
 	cp $(TARBALLS)/expected.hpp $(PREFIX)/include/nonstd/expected.hpp
 
-.restinio: restinio .sum-restinio
+.restinio: restinio toolchain.cmake .sum-restinio
 	cd $</dev && $(HOSTVARS) $(CMAKE) $(RESTINIO_CMAKECONF) .
 	cd $</dev && $(MAKE) install
 	touch $@
diff --git a/contrib/src/yaml-cpp/rules.mak b/contrib/src/yaml-cpp/rules.mak
index 415034b6de..0daa406039 100644
--- a/contrib/src/yaml-cpp/rules.mak
+++ b/contrib/src/yaml-cpp/rules.mak
@@ -26,6 +26,7 @@ yaml-cpp: yaml-cpp-$(YAML_CPP_VERSION).tar.gz .sum-yaml-cpp
 	$(MOVE)
 
 .yaml-cpp: yaml-cpp toolchain.cmake
-	cd $< && $(HOSTVARS) $(CMAKE) . $(YAML_CPP_CMAKECONF)
-	cd $< && $(MAKE) install
+	cd $< && mkdir -p build
+	cd $< && cd build && $(HOSTVARS) $(CMAKE) .. $(YAML_CPP_CMAKECONF)
+	cd $< && cd build && $(MAKE) install
 	touch $@
-- 
GitLab