projects
/
discourse_docker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24b887f
)
Update imagemagick to ImageMagick7.
author
Guo Xiang Tan
<tgx_world@hotmail.com>
Tue, 17 Jul 2018 06:30:50 +0000
(14:30 +0800)
committer
Guo Xiang Tan
<tgx_world@hotmail.com>
Tue, 17 Jul 2018 06:30:50 +0000
(14:30 +0800)
image/base/install-imagemagick
patch
|
blob
|
blame
|
history
diff --git
a/image/base/install-imagemagick
b/image/base/install-imagemagick
index e88b9c0181e39adf2e6a27197e417eb29146f52c..fc968fa7fbd3c38b4353f31eed33787c43a3b40a 100755
(executable)
--- a/
image/base/install-imagemagick
+++ b/
image/base/install-imagemagick
@@
-16,11
+16,9
@@
cd $WDIR/libpng
./configure --prefix=$PREFIX
make all && make install
./configure --prefix=$PREFIX
make all && make install
-
-
# Build and install ImageMagick
# Build and install ImageMagick
-wget -O $WDIR/ImageMagick.tar.gz "http
s://github.com/ImageMagick/ImageMagick6/archive/6.9.9-51
.tar.gz"
-IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick
6
-*/configure" |cut -d/ -f1)
+wget -O $WDIR/ImageMagick.tar.gz "http
://www.imagemagick.org/download/ImageMagick-7.0.8-6
.tar.gz"
+IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
cd $IMDIR
PKG_CONF_LIBDIR=$PREFIX/lib LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
cd $IMDIR
PKG_CONF_LIBDIR=$PREFIX/lib LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
@@
-44,7
+42,6
@@
PKG_CONF_LIBDIR=$PREFIX/lib LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./con
--with-tiff
make all && make install
--with-tiff
make all && make install
-
cd $HOME
rm -rf $WDIR
cd $HOME
rm -rf $WDIR
-ldconfig
+ldconfig
/usr/local/lib