summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2018-03-03 07:33:24 (GMT)
committerTony Theodore <tonyt@logyst.com>2018-03-03 07:33:24 (GMT)
commitd049e6ef792865dcc56532ea7d689c3abfdef1dc (patch)
treedf97958ff5914bb3e9be211e5856910fcbac2b88
parent8c784dbef1c419826433f76c639e89a582ddd6e4 (diff)
parentbf8563ff7842ea4ec02b2893d947d61cf2c7be15 (diff)
downloadmxe-d049e6ef792865dcc56532ea7d689c3abfdef1dc.zip
mxe-d049e6ef792865dcc56532ea7d689c3abfdef1dc.tar.gz
mxe-d049e6ef792865dcc56532ea7d689c3abfdef1dc.tar.bz2
Merge branch 'patch-1' of https://github.com/SupSuper/mxe into SupSuper-patch-1
-rw-r--r--src/yaml-cpp.mk16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/yaml-cpp.mk b/src/yaml-cpp.mk
index 56d2d5d..1e73d24 100644
--- a/src/yaml-cpp.mk
+++ b/src/yaml-cpp.mk
@@ -4,16 +4,10 @@ PKG := yaml-cpp
$(PKG)_WEBSITE := https://github.com/jbeder/yaml-cpp
$(PKG)_DESCR := A YAML parser and emitter for C++
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 0.5.3
-$(PKG)_CHECKSUM := 3492d9c1f4319dfd5588f60caed7cec3f030f7984386c11ed4b39f8e3316d763
-$(PKG)_SUBDIR := $(PKG)-release-$($(PKG)_VERSION)
-$(PKG)_FILE := yaml-cpp-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := https://github.com/jbeder/yaml-cpp/archive/release-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS := cc boost
-
-define $(PKG)_UPDATE
- $(call MXE_GET_GITHUB_TAGS, jbeder/yaml-cpp, \(yaml-cpp-\|release-\))
-endef
+$(PKG)_VERSION := 0.6.1
+$(PKG)_CHECKSUM := 25ec37e6d82ab8c485926d69a5567741c7263515f8631e5dcb3fb4708e6b0d0d
+$(PKG)_GH_CONF := jbeder/yaml-cpp/releases/latest,yaml-cpp-
+$(PKG)_DEPS := cc
define $(PKG)_BUILD
cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
@@ -21,7 +15,7 @@ define $(PKG)_BUILD
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
'$(TARGET)-g++' \
- -W -Wall -Werror -ansi -pedantic \
+ -W -Wall -Werror -ansi -pedantic -std=c++11 \
'$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
`'$(TARGET)-pkg-config' $(PKG) --cflags --libs`
endef