diff --git a/contrib/src/yaml-cpp/SHA512SUMS b/contrib/src/yaml-cpp/SHA512SUMS index 91506c303d3c5cb06efc52d26bf345de093443cf..ad0ef643c070b5345743604b1fa7120bd96f53da 100644 --- a/contrib/src/yaml-cpp/SHA512SUMS +++ b/contrib/src/yaml-cpp/SHA512SUMS @@ -1 +1 @@ -63f70fdc4cb23c90a9c671dadc57093250c351828b7f9ad70a1c8389ea5aefc6bcf30b186a62f3319ae011d0a0a091abced130e6754a244418d52c3e74b0e2c1 yaml-cpp-24fa1b33805c9a91df0f32c46c28e314dd7ad96f.tar.gz +68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49 yaml-cpp-yaml-cpp-0.6.3.tar.gz \ No newline at end of file diff --git a/contrib/src/yaml-cpp/cmake.patch b/contrib/src/yaml-cpp/cmake.patch deleted file mode 100644 index ec077b2e4c6a08e77bae32186d3b405d30eccbaf..0000000000000000000000000000000000000000 --- a/contrib/src/yaml-cpp/cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- yaml-cpp/CMakeLists.txt.orig 2014-09-05 18:09:22.644410515 -0400 -+++ yaml-cpp/CMakeLists.txt 2014-09-05 18:12:20.372407142 -0400 -@@ -269,10 +269,10 @@ - FILES_MATCHING PATTERN "*.h" - ) - --if(UNIX) -+if(UNIX OR MINGW) - set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) - configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) -- install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -+ install(FILES ${PC_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) - endif() diff --git a/contrib/src/yaml-cpp/rules.mak b/contrib/src/yaml-cpp/rules.mak index 8ea84c3e5e5881e8f1660b58d6651d87ca44fdbe..d29e5b6218ce41f7b2d332c4604e3d4a8b439e5d 100644 --- a/contrib/src/yaml-cpp/rules.mak +++ b/contrib/src/yaml-cpp/rules.mak @@ -1,5 +1,5 @@ # YAML -YAML_CPP_VERSION := 24fa1b33805c9a91df0f32c46c28e314dd7ad96f +YAML_CPP_VERSION := yaml-cpp-0.6.3 YAML_CPP_URL := https://github.com/jbeder/yaml-cpp/archive/$(YAML_CPP_VERSION).tar.gz PKGS += yaml-cpp @@ -8,10 +8,12 @@ ifeq ($(call need_pkg,'yaml-cpp >= 0.5.3'),) PKGS_FOUND += yaml-cpp endif -YAML_CPP_CMAKECONF := -DBUILD_STATIC:BOOL=ON \ - -DBUILD_SHARED:BOOL=OFF \ - -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ - -DBUILD_SHARED_LIBS:BOOL=OFF +YAML_CPP_CMAKECONF := -DBUILD_STATIC=ON \ + -DBUILD_SHARED=OFF \ + -DYAML_CPP_BUILD_TOOLS=OFF \ + -DYAML_CPP_BUILD_TESTS=OFF \ + -DYAML_CPP_BUILD_CONTRIB=OFF \ + -DBUILD_SHARED_LIBS=OFF $(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz: $(call download,$(YAML_CPP_URL)) @@ -20,7 +22,6 @@ $(TARBALLS)/yaml-cpp-$(YAML_CPP_VERSION).tar.gz: yaml-cpp: yaml-cpp-$(YAML_CPP_VERSION).tar.gz .sum-yaml-cpp $(UNPACK) - $(APPLY) $(SRC)/yaml-cpp/cmake.patch $(MOVE) .yaml-cpp: yaml-cpp toolchain.cmake