From 5ff150e4a7237a2cfcdbb479a57d94c1fa19a661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 7 Mar 2016 12:27:23 +0100 Subject: [PATCH] ImageMagick: revbump to re-enable libmagic-perl --- srcpkgs/ImageMagick/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index eb7b13c2754..29f3cc54b97 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,7 +3,7 @@ pkgname=ImageMagick _majorver=6.9.3 _patchver=6 version=${_majorver}.${_patchver} -revision=2 +revision=3 wrksrc=${pkgname}-${_majorver}-${_patchver} build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes @@ -29,14 +29,12 @@ makedepends="libjpeg-turbo-devel libpng-devel tiff-devel librsvg-devel ghostscript-devel ocl-icd-devel" conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml" -# Currently broken. -# See: http://build.voidlinux.eu/builders/x86_64_builder/builds/21467/steps/shell_3/logs/stdio -#if [ -z "$CROSS_BUILD" ]; then -# # XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic) -# configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor" -# hostmakedepends+=" perl" -# subpackages+=" libmagick-perl" -#fi +if [ -z "$CROSS_BUILD" ]; then + # XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic) + configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor" + hostmakedepends+=" perl" + subpackages+=" libmagick-perl" +fi pre_configure() { autoreconf -if