cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zstd-webp-update' into 'master'

Browse Source 
gitlab-ci: use latest zstd and webp versions

See merge request libtiff/libtiff!148
This commit is contained in:
Even Rouault 2020-05-09 12:15:38 +00:00
commit 2a597b76cc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/gitlab-ci
View File

@ -2,6 +2,10 @@
# This script is used for testing the build, primarily for use # This script is used for testing the build, primarily for use
# with travis, but may be used by hand as well. # with travis, but may be used by hand as well.
# Library versions to use
ZSTD_VER=1.4.4
WEBP_VER=1.1.0
set -e set -e
set -x set -x
@ -40,23 +44,23 @@ build=$1
shift shift
# Build zstd # Build zstd
wget https://github.com/facebook/zstd/archive/v1.3.3.tar.gz wget https://github.com/facebook/zstd/archive/v${ZSTD_VER}.tar.gz
tar xvzf v1.3.3.tar.gz tar xvzf v${ZSTD_VER}.tar.gz
cd zstd-1.3.3/lib cd zstd-${ZSTD_VER}/lib
# Faster build # Faster build
make -j3 PREFIX=/tmp ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1 make -j3 PREFIX=/tmp ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1
make install PREFIX=/tmp ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1 make install PREFIX=/tmp ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1
cd ../.. cd ../..
rm -rf zstd-1.3.3 rm -rf zstd-${ZSTD_VER}
# Build webp # Build webp
wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.0.tar.gz wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VER}.tar.gz
tar xvzf libwebp-1.0.0.tar.gz tar xvzf libwebp-${WEBP_VER}.tar.gz
cd libwebp-1.0.0 cd libwebp-${WEBP_VER}
./configure --prefix=/tmp ./configure --prefix=/tmp
make && make install make && make install
cd .. cd ..
rm -rf libwebp-1.0.0 rm -rf libwebp-${WEBP_VER}
export LD_LIBRARY_PATH=/tmp/lib export LD_LIBRARY_PATH=/tmp/lib