[gimp/wip/Jehan/revert-json-c-CI] Revert "build: fix json-c cross-build for Windows."



commit 2a879e4221aa9e5926c4f051285297b4c6996ab4
Author: Jehan <jehan girinstud io>
Date:   Tue Mar 17 13:20:14 2020 +0100

    Revert "build: fix json-c cross-build for Windows."
    
    This reverts commit 2b2a6b03edf5ff0831b776ef878fc68c5e3cf487.
    My commit has been merged upstream.

 build/windows/crossbuild-gitlab-ci/build-deps.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/build/windows/crossbuild-gitlab-ci/build-deps.sh 
b/build/windows/crossbuild-gitlab-ci/build-deps.sh
index 69cded67ec..34f2dfebf7 100644
--- a/build/windows/crossbuild-gitlab-ci/build-deps.sh
+++ b/build/windows/crossbuild-gitlab-ci/build-deps.sh
@@ -35,12 +35,9 @@ cd ..
 
 # json-c
 
-# TODO: implicit-fallthrough and no-return-type warnings must be
-# reenabled once the following patch has been merged into json-c source:
-# https://github.com/json-c/json-c/pull/556
 git clone --depth 1 https://github.com/json-c/json-c.git && \
 mkdir json-c/_build && cd json-c/_build && \
-CFLAGS="-Wno-expansion-to-defined -Wimplicit-fallthrough=0 -Wno-return-type" crossroad ../configure && make 
install || exit 1
+CFLAGS="-Wno-expansion-to-defined" crossroad ../configure && make install || exit 1
 cd ../..
 
 # libmypaint


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]