summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-01-25 21:38:05 +0300
committerAndrei Karas <akaras@inbox.ru>2019-01-25 21:38:05 +0300
commitaec9c3f1ec2c40de0f2304f4864f547bf1e91e04 (patch)
treedd5b8cdfb8d8d8d7f56a67a401c9e275b519781c
parent803c0016e39f72f621810f4b7e6d3f771b5ab1b9 (diff)
downloadspm-SDL.tar.gz
spm-SDL.tar.bz2
spm-SDL.tar.xz
spm-SDL.zip
Fix libxml2 compilationSDL
-rw-r--r--.gitlab-ci.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bc6b7a..0403cd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ SDL_SDL-1.2_old:
- ${runenvtool} ./.ci/buildlib.sh SDL_gfx master
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng libpng10
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype VER-2-4-9
- - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 v2.9.1
+ - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl curl-7_12_3
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 2.0.2
- ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh SDL_image release-1.2.5
@@ -195,7 +195,7 @@ manaplus_SDL-1.2_old:
LIBNAME: SDL
LIBVERSION: SDL-1.2_old
runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
- runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
+ runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
POST_CXXFLAGS: "-Wno-undef"
dependencies:
- SDL_SDL-1.2_old
@@ -219,7 +219,7 @@ manaplus_SDL-1.2_old_test:
LIBNAME: SDL
LIBVERSION: SDL-1.2_old
runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
- runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
+ runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
POST_CXXFLAGS: "-Wno-undef"
dependencies:
- SDL_SDL-1.2_old
@@ -290,7 +290,7 @@ manaplus_SDL-1.2_old_asan_test:
LIBNAME: SDL
LIBVERSION: SDL-1.2_old
runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
- runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
+ runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
POST_CXXFLAGS: "-Wno-undef"
ASAN_OPTIONS: "detect_leaks=0"
JOBS: 1
@@ -316,7 +316,7 @@ manaplus_SDL-1.2_old_asan:
LIBNAME: SDL
LIBVERSION: SDL-1.2_old
runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
- runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
+ runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
POST_CXXFLAGS: "-Wno-undef"
dependencies:
- SDL_SDL-1.2_old