diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-05 04:08:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-05 04:08:47 +0300 |
| commit | 655101bd16c4d5e777fb53613e38d7746fb09864 (patch) | |
| tree | cc2a803d3f51c83e8b74c8c7e44c086c689258f3 /.gitlab-ci.yml | |
| parent | 5f65177d21c2801ecd531c88c2051b2905085e2e (diff) | |
| download | spm-655101bd16c4d5e777fb53613e38d7746fb09864.tar.gz spm-655101bd16c4d5e777fb53613e38d7746fb09864.tar.bz2 spm-655101bd16c4d5e777fb53613e38d7746fb09864.tar.xz spm-655101bd16c4d5e777fb53613e38d7746fb09864.zip | |
Fix asan builds again.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 082bfce..3e58193 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,32 +57,6 @@ test:commands2: srcbranch: curl-7_51_0 <<: *job-artifacts -SDL_SDL-1.2: - stage: build - script: - - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake - libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev - - ./.ci/copyspm.sh - - ./.ci/buildlib.sh SDL SDL-1.2 - - ${runenvtool} ./.ci/buildlib.sh zlib master - - ${runenvtool} ./.ci/buildlib.sh SDL_gfx master - - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 - - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master - - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master - - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master - - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master - - ${runenvtool} ./.ci/buildlib.sh SDL_image SDL-1.2 - - ${runenvtool} ./.ci/buildlib.sh SDL_mixer SDL-1.2 - - ${runenvtool} ./.ci/buildlib.sh SDL_net SDL-1.2 - - ${runenvtool} ./.ci/buildlib.sh SDL_ttf SDL-1.2 - - ./.ci/copyfinal.sh - - grep "1.2" /usr/local/spm/bin/SDL_SDL-1.2/lib/pkgconfig/sdl.pc - variables: - installname: SDL_SDL-1.2 - runenvtool: /usr/local/spm/env/run${installname}.sh - runenvtoolz: /usr/local/spm/env/runzlib_master.sh - <<: *job-artifacts - SDL_SDL-1.2_asan: stage: build script: @@ -104,7 +78,7 @@ SDL_SDL-1.2_asan: - ${runenvtool} ./.ci/buildlib.sh SDL_ttf SDL-1.2 - export LD_PRELOAD - ./.ci/copyfinal.sh - - grep "1.2" /usr/local/spm/bin/SDL_SDL-1.2/lib/pkgconfig/sdl.pc + - grep "1.2" /usr/local/spm/bin/${installname}/lib/pkgconfig/sdl.pc variables: installname: SDL_SDL-1.2_asan runenvtool: /usr/local/spm/env/run${installname}.sh @@ -190,6 +164,32 @@ SDL_default_asan: -fno-omit-frame-pointer" <<: *job-artifacts +SDL_SDL-1.2: + stage: build + script: + - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev + - ./.ci/copyspm.sh + - ./.ci/buildlib.sh SDL SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh zlib master + - ${runenvtool} ./.ci/buildlib.sh SDL_gfx master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh physfs stable-2.0 + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master + - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master + - ${runenvtool} ./.ci/buildlib.sh SDL_image SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_mixer SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_net SDL-1.2 + - ${runenvtool} ./.ci/buildlib.sh SDL_ttf SDL-1.2 + - ./.ci/copyfinal.sh + - grep "1.2" /usr/local/spm/bin/SDL_SDL-1.2/lib/pkgconfig/sdl.pc + variables: + installname: SDL_SDL-1.2 + runenvtool: /usr/local/spm/env/run${installname}.sh + runenvtoolz: /usr/local/spm/env/runzlib_master.sh + <<: *job-artifacts + SDL_default: stage: build script: |