diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-01-25 13:42:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-01-25 17:10:57 +0000 |
| commit | e50a8f3fc7c3b3919bb5df8d370be253cada7ba8 (patch) | |
| tree | 1f6db1a61b496034194466ea903a6f08f182f63d | |
| parent | 391a5aae47ca22c345410f992087e0bfb5acd20f (diff) | |
| download | aports-e50a8f3fc7c3b3919bb5df8d370be253cada7ba8.tar.bz2 aports-e50a8f3fc7c3b3919bb5df8d370be253cada7ba8.tar.xz | |
main/imagemagick: upgrade to 7.0.7.22 and disable openmp on s390x
the test still seems to deadlock on s390x when openmp is enabled.
Disable it again.
We also disbale running the tests as fakeroot because it is not necessary.
| -rw-r--r-- | main/imagemagick/APKBUILD | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD index c3ddd6993d..6bda48a7d3 100644 --- a/main/imagemagick/APKBUILD +++ b/main/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=imagemagick -pkgver=7.0.7.21 +pkgver=7.0.7.22 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -10,7 +10,7 @@ pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" arch="all" license="Apache-2.0" -options="libtool" +options="libtool !checkroot" makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev perl-dev ghostscript-dev libwebp-dev libtool tiff-dev lcms2-dev libwebp-dev libxml2-dev librsvg-dev" @@ -25,6 +25,10 @@ build() { sed -i -e \ 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/imagemagick":g' \ configure + local _openmp= + case "$CARCH" in + s390x) _openmp="--disable-openmp" + esac ./configure \ --build=$CBUILD \ @@ -34,6 +38,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ + $_openmp \ --with-threads \ --without-x \ --with-tiff \ @@ -77,4 +82,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="1bbdeb1a67f2057f2c17cee4d0cdd5d9d5304f961b4a5e45c05ac797e941cda9eb73795c273c9b2fd4f3ec6a84e84570c6c91f667a8ae0fbd6c3e1e2b6bb54ce ImageMagick-7.0.7-21.tar.xz" +sha512sums="3a5bcceb8469c743738d71db670ea60e30fdb4c1bacc5719832828d97d52c256366ce3a4d80aace1466109ac42b9bb6ca8b5c53f939c043eac2d1c816961d772 ImageMagick-7.0.7-22.tar.xz" |