From d056bd7de9f3e82354b8a8dc19d72d949bef840f Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Mon, 15 Feb 2016 13:02:35 -0500
Subject: [PATCH] contrib: bump yaml-cpp
- Use new version using C++11 shared_ptr rather
than boost implementation
- This remove the dependence to boost
Tuleap: #381
Change-Id: I64f0b58c75b9a573098a41f9f675067bb1e1f5ea
---
contrib/src/boost-headers/SHA512SUMS | 1 -
contrib/src/boost-headers/rules.mak | 17 -----------------
contrib/src/yaml-cpp/SHA512SUMS | 2 +-
contrib/src/yaml-cpp/rules.mak | 7 ++-----
4 files changed, 3 insertions(+), 24 deletions(-)
delete mode 100644 contrib/src/boost-headers/SHA512SUMS
delete mode 100644 contrib/src/boost-headers/rules.mak
diff --git a/contrib/src/boost-headers/SHA512SUMS b/contrib/src/boost-headers/SHA512SUMS
deleted file mode 100644
index e9f8fab96c..0000000000
--- a/contrib/src/boost-headers/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-a0ac451a51c5b183ee5625da66ccdbbc5a079d71c3d1bd7570e1e5f30a3f2f852a8e8237a60a3419ee72bcffdf4e1e7867d9d6ab91cf314db95df2142b70c008 boost-headers.tar.gz
diff --git a/contrib/src/boost-headers/rules.mak b/contrib/src/boost-headers/rules.mak
deleted file mode 100644
index ca835b1826..0000000000
--- a/contrib/src/boost-headers/rules.mak
+++ /dev/null
@@ -1,17 +0,0 @@
-# Boost headers (needed for building yaml-cpp)
-BOOST_HEADERS_URL = https://gitlab.savoirfairelinux.com/sfl-ports/boost-headers/repository/archive.tar.gz
-
-$(TARBALLS)/boost-headers.tar.gz:
- $(call download,$(BOOST_HEADERS_URL))
-
-.sum-boost-headers: boost-headers.tar.gz
-
-boost-headers: boost-headers.tar.gz .sum-boost-headers
- $(UNPACK)
- mv boost-headers.git $@
- touch $@
-
-.boost-headers: boost-headers
- mkdir -p ../$(HOST)/include
- cp -rf $< ../$(HOST)/include/boost
- touch $@
diff --git a/contrib/src/yaml-cpp/SHA512SUMS b/contrib/src/yaml-cpp/SHA512SUMS
index 33bd589f3f..77162fcfa0 100644
--- a/contrib/src/yaml-cpp/SHA512SUMS
+++ b/contrib/src/yaml-cpp/SHA512SUMS
@@ -1 +1 @@
-3c6928684d603815c016d663af36be94507f2cccf167d6d8d7cd7dea3ea5f73ec88d62952a2b5d11796e40132857afcbbacd9eafd688f2dc11d0c339caf2e013 yaml-cpp-0.5.1.tar.gz
+0347377adf60b28cf542fef6a6f24585d93ebab28f413b7ed0ac395093ca09c1ba55f7a9b172ae24214ff72128b40d0a3a821ec5015fb30a8b49d992d794c3e7 yaml-cpp-24fa1b33805c9a91df0f32c46c28e314dd7ad96f.tar.gz
diff --git a/contrib/src/yaml-cpp/rules.mak b/contrib/src/yaml-cpp/rules.mak
index 5854a556a7..4b9fcf8378 100644
--- a/contrib/src/yaml-cpp/rules.mak
+++ b/contrib/src/yaml-cpp/rules.mak
@@ -1,6 +1,6 @@
# YAML
-YAML_CPP_VERSION := 0.5.1
-YAML_CPP_URL := http://yaml-cpp.googlecode.com/files/yaml-cpp-$(YAML_CPP_VERSION).tar.gz
+YAML_CPP_VERSION := 24fa1b33805c9a91df0f32c46c28e314dd7ad96f
+YAML_CPP_URL := https://github.com/jbeder/yaml-cpp/archive/$(YAML_CPP_VERSION).tar.gz
PKGS += yaml-cpp
@@ -8,12 +8,9 @@ ifeq ($(call need_pkg,'yaml-cpp'),)
PKGS_FOUND += yaml-cpp
endif
-DEPS_yaml-cpp = boost-headers $(DEPS_boost-headers)
-
YAML_CPP_CMAKECONF := -DBUILD_STATIC:BOOL=ON \
-DBUILD_SHARED:BOOL=OFF \
-DYAML_CPP_BUILD_TOOLS:BOOL=OFF \
- -DBoost_INCLUDE_DIR=../../$(HOST)/include \
-DBUILD_SHARED_LIBS:BOOL=OFF
$(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz:
--
GitLab