diff options
| author | Boris Pek <tehnick-8@yandex.ru> | 2016-04-28 14:45:42 (GMT) |
|---|---|---|
| committer | Boris Pek <tehnick-8@yandex.ru> | 2016-04-30 19:09:16 (GMT) |
| commit | 0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38 (patch) | |
| tree | 062c5bd779ec00fd2a14933c09296b1cfd70f98f /src | |
| parent | 58c2c96b967957a1a2df062f13dd4a5817aae792 (diff) | |
| download | mxe-0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38.zip mxe-0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38.tar.gz mxe-0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38.tar.bz2 | |
jsoncpp: add workaround for builds with GCC >= 6.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/jsoncpp.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index c812fa1..532d20b 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -10,6 +10,9 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/open-source-parsers/jsoncpp/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc +# workaround for builds with GCC >= 6.x +$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-error=shift-negative-value + define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/open-source-parsers/jsoncpp/archive/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/"\.tar.*,\1,p' | \ @@ -22,6 +25,7 @@ define $(PKG)_BUILD cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ + -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \ -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install |