Skip to content

GitLab

Commit b8fe634b authored by Andrew Murray's avatar Andrew Murray
Browse files

Simplified build_openjpeg by using fetch_unpack output

parent f1bcb198
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
library_builders.sh
View file @ b8fe634b
...@@ -169,13 +169,11 @@ function build_openjpeg { ...@@ -169,13 +169,11 @@ function build_openjpeg {
build_lcms2 build_lcms2
local cmake=$(get_cmake) local cmake=$(get_cmake)
local archive_prefix="v" local archive_prefix="v"
local directory_prefix="openjpeg-"
if [ $(lex_ver $OPENJPEG_VERSION) -lt $(lex_ver 2.1.1) ]; then if [ $(lex_ver $OPENJPEG_VERSION) -lt $(lex_ver 2.1.1) ]; then
archive_prefix="version." archive_prefix="version."
directory_prefix="openjpeg-version."
fi fi
fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/${archive_prefix}${OPENJPEG_VERSION}.tar.gz)
(cd ${directory_prefix}${OPENJPEG_VERSION} \ (cd $out_dir \
&& $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX . \
&& make install) && make install)
touch openjpeg-stamp touch openjpeg-stamp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment