Package: libimage-magick-perl
Version: 8:6.8.9.9-5
Severity: normal

The PerlMagick/quantum/Makefile.PL was using the wrong
magick/magick-baseconfig.h file. I've attached a patch to fix this problem.


Regards,

Bas van Sisseren

-- 
Bas van Sisseren <b...@quarantainenet.nl>
Quarantainenet
Description: Fix include path for PerlMagick builds
 The quantum/Makefile.PL.in defined the wrong include-path for the
 magick/magick-baseconfig.h file. The hardcoded upstream version was
 used instead. This patch adds an error to the hardcoded upstream
 magick/magick-baseconfig.h file, to ensure we will not use that file,
 and fixes the quantum/Makefile.PL.in.
Bug-Debian: https://bugs.debian.org/777158

--- imagemagick-6.8.9.9.orig/PerlMagick/quantum/Makefile.PL.in
+++ imagemagick-6.8.9.9/PerlMagick/quantum/Makefile.PL.in
@@ -161,7 +161,7 @@ foreach my $delegate (@tested_delegates)
 }
 
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
-my $INC_magick = '-I../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
+my $INC_magick = '-I../../ -I@top_srcdir@ @CPPFLAGS@ -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@';
 my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@";
 my $LDFLAGS_magick   = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@";
--- imagemagick-6.8.9.9.orig/magick/magick-baseconfig.h
+++ imagemagick-6.8.9.9/magick/magick-baseconfig.h
@@ -1,3 +1,5 @@
+#error this is the upstream baseconfig.h. we should not include this file!
+
 #ifndef _MAGICK_MAGICK_BASECONFIG_H
 #define _MAGICK_MAGICK_BASECONFIG_H 1
  

Reply via email to