Skip to content
Snippets Groups Projects
Commit 0e60561d authored by Adrien Béraud's avatar Adrien Béraud
Browse files

contrib: always depend on toolchain.cmake when using cmake

Change-Id: I99f4194635d6a2cf26a4cef58880c947817d6909
parent a0eab28c
Branches
Tags
No related merge requests found
...@@ -28,7 +28,7 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive ...@@ -28,7 +28,7 @@ libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.xz .sum-libarchive
$(UNPACK) $(UNPACK)
$(MOVE) $(MOVE)
.libarchive: libarchive toolchain.cmake .libarchive: libarchive toolchain.cmake .sum-libarchive
cd $< && mkdir -p buildlib cd $< && mkdir -p buildlib
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
cd $< && cp -R contrib/android/include/* $(PREFIX)/include cd $< && cp -R contrib/android/include/* $(PREFIX)/include
......
...@@ -30,9 +30,9 @@ llhttp: llhttp-$(LLHTTP_VERSION).tar.gz ...@@ -30,9 +30,9 @@ llhttp: llhttp-$(LLHTTP_VERSION).tar.gz
$(UNPACK) $(UNPACK)
mv llhttp-release-v$(LLHTTP_VERSION) $@ 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 $< && mkdir -p build && cd build && $(HOSTVARS) $(CMAKE) $(LLHTTP_CMAKECONF) ..
cd $</build && $(MAKE) && $(MAKE) install cd $</build && $(MAKE) && $(MAKE) install
touch $@ touch $@
.sum-llhttp: llhttp-$(LLHTTP_VERSION).tar.gz
...@@ -28,7 +28,7 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz ...@@ -28,7 +28,7 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz
$(UNPACK) $(UNPACK)
$(MOVE) $(MOVE)
.opendht: opendht .sum-opendht .opendht: opendht toolchain.cmake .sum-opendht
cd $< && mkdir -p build cd $< && mkdir -p build
cd $< && cd build && $(HOSTVARS) $(CMAKE) $(OPENDHT_CONF) .. cd $< && cd build && $(HOSTVARS) $(CMAKE) $(OPENDHT_CONF) ..
cd $< && cd build && $(MAKE) install cd $< && cd build && $(MAKE) install
......
...@@ -41,7 +41,7 @@ restinio: restinio-$(RESTINIO_VERSION).tar.bz2 expected.hpp ...@@ -41,7 +41,7 @@ restinio: restinio-$(RESTINIO_VERSION).tar.bz2 expected.hpp
mkdir -p $(PREFIX)/include/nonstd mkdir -p $(PREFIX)/include/nonstd
cp $(TARBALLS)/expected.hpp $(PREFIX)/include/nonstd/expected.hpp 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 && $(HOSTVARS) $(CMAKE) $(RESTINIO_CMAKECONF) .
cd $</dev && $(MAKE) install cd $</dev && $(MAKE) install
touch $@ touch $@
...@@ -26,6 +26,7 @@ yaml-cpp: yaml-cpp-$(YAML_CPP_VERSION).tar.gz .sum-yaml-cpp ...@@ -26,6 +26,7 @@ yaml-cpp: yaml-cpp-$(YAML_CPP_VERSION).tar.gz .sum-yaml-cpp
$(MOVE) $(MOVE)
.yaml-cpp: yaml-cpp toolchain.cmake .yaml-cpp: yaml-cpp toolchain.cmake
cd $< && $(HOSTVARS) $(CMAKE) . $(YAML_CPP_CMAKECONF) cd $< && mkdir -p build
cd $< && $(MAKE) install cd $< && cd build && $(HOSTVARS) $(CMAKE) .. $(YAML_CPP_CMAKECONF)
cd $< && cd build && $(MAKE) install
touch $@ touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment