dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "build: fix json-c cross-build for Windows."

Browse source 
This reverts commit 2b2a6b03ed.
My commit has been merged upstream.
This commit is contained in:
Jehan 2020-03-17 13:20:14 +01:00
parent 8d5afa76e7
commit bed95ebca7
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/windows/crossbuild-gitlab-ci/build-deps.sh
View file

@ -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