diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-05-01 07:40:08 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-05-01 07:40:08 (GMT) |
| commit | d8f1d36d71519e868b218aae3774c773ec89c199 (patch) | |
| tree | 409c6fc2cef356fba42a3a53d7dca472cf6cf0cd /src/jsoncpp.mk | |
| parent | e6d7f5284ee0547ad274f9cdda8d1c01e630bef8 (diff) | |
| parent | 970fa1e6176bbfded601b5bd0d2716a233e49247 (diff) | |
| download | mxe-d8f1d36d71519e868b218aae3774c773ec89c199.zip mxe-d8f1d36d71519e868b218aae3774c773ec89c199.tar.gz mxe-d8f1d36d71519e868b218aae3774c773ec89c199.tar.bz2 | |
Merge pull request #1317 from tehnick/gcc6-plugin
Add gcc6 plugin
Diffstat (limited to 'src/jsoncpp.mk')
| -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 |