From 28fcf3c8285e1ea160e42257bfcc64a3133c712c Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 20 Jun 2015 15:15:15 +0200 Subject: [PATCH] ImageMagick: unbreak cross installation --- srcpkgs/ImageMagick/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index c7c3f7483b3..821a6e89820 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,7 +3,7 @@ pkgname=ImageMagick _majorver=6.9.1 _patchver=5 version=${_majorver}.${_patchver} -revision=1 +revision=2 wrksrc=${pkgname}-${_majorver}-${_patchver} build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes @@ -17,9 +17,8 @@ homepage="http://www.imagemagick.org/" license="ImageMagick" distfiles="ftp://ftp.sunet.se/pub/multimedia/graphics/${pkgname}/${pkgname}-${_majorver}-${_patchver}.tar.xz" checksum=34d59b83a2c3e526a7fad1fed30a950ea7b4ba2e936017a4c71581250c86352d -nocross="http://build.voidlinux.eu/builders/armv6l_builder/builds/14568/steps/shell_3/logs/stdio" -subpackages="libmagick libmagick-devel" +subpackages="libmagick libmagick-devel" if [ -z "$CROSS_BUILD" ]; then # XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic) configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor" @@ -28,7 +27,7 @@ if [ -z "$CROSS_BUILD" ]; then fi keep_libtool_archives=yes -hostmakedepends="pkg-config" +hostmakedepends="pkg-config libtool" makedepends="libjpeg-turbo-devel libpng-devel tiff-devel lcms2-devel freetype-devel libwebp-devel fontconfig-devel libXext-devel libXt-devel libltdl-devel libxml2-devel glib-devel pango-devel gdk-pixbuf-devel @@ -49,6 +48,9 @@ conf_files=" /etc/ImageMagick-${_majorver%%.*}/type-ghostscript.xml /etc/ImageMagick-${_majorver%%.*}/type-windows.xml" +pre_configure() { + libtoolize -f +} post_install() { vlicense LICENSE vlicense NOTICE