From 551d89815cf228a202e1622f45024113e1367bbd Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Thu, 11 Sep 2014 22:20:05 -0400
Subject: [PATCH] contrib: fix boost-header rules
Change-Id: Ie3d03f816bea74fea76051b90a07e0f36f144db6
---
daemon/contrib/src/boost-headers/rules.mak | 5 ++++-
daemon/contrib/src/yaml-cpp/rules.mak | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/daemon/contrib/src/boost-headers/rules.mak b/daemon/contrib/src/boost-headers/rules.mak
index 1dfc64485a..ca835b1826 100644
--- a/daemon/contrib/src/boost-headers/rules.mak
+++ b/daemon/contrib/src/boost-headers/rules.mak
@@ -8,7 +8,10 @@ $(TARBALLS)/boost-headers.tar.gz:
boost-headers: boost-headers.tar.gz .sum-boost-headers
$(UNPACK)
- mv boost-headers.git boost
+ mv boost-headers.git $@
+ touch $@
.boost-headers: boost-headers
+ mkdir -p ../$(HOST)/include
+ cp -rf $< ../$(HOST)/include/boost
touch $@
diff --git a/daemon/contrib/src/yaml-cpp/rules.mak b/daemon/contrib/src/yaml-cpp/rules.mak
index 371004efbb..1087f61725 100644
--- a/daemon/contrib/src/yaml-cpp/rules.mak
+++ b/daemon/contrib/src/yaml-cpp/rules.mak
@@ -12,7 +12,7 @@ DEPS_yaml-cpp = boost-headers $(DEPS_boost-headers)
YAML_CPP_CMAKECONF := -DBUILD_STATIC:BOOL=ON \
-DBUILD_SHARED:BOOL=OFF \
- -DBoost_INCLUDE_DIR=../ \
+ -DBoost_INCLUDE_DIR=../../$(HOST)/include \
-DBUILD_SHARED_LIBS:BOOL=OFF
$(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz:
--
GitLab