diff options
| author | Remi Collet <remi@remirepo.net> | 2021-04-06 07:28:25 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-04-06 07:28:25 +0200 |
| commit | dc7c122642a605dd55efa40298de2cbda8b3a0ff (patch) | |
| tree | b1915ca8d6967e5dcf3c19597eaafba723467f89 /ImageMagick-perl.patch | |
| parent | 3edbbd35a6e46ed0a54f6df31942c86c3bb013a6 (diff) | |
update to version 6.9.12 patch level 6
fix perl syntax using patch from
https://github.com/ImageMagick/ImageMagick6/pull/144
Diffstat (limited to 'ImageMagick-perl.patch')
| -rw-r--r-- | ImageMagick-perl.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/ImageMagick-perl.patch b/ImageMagick-perl.patch new file mode 100644 index 0000000..e971109 --- /dev/null +++ b/ImageMagick-perl.patch @@ -0,0 +1,36 @@ +From 9740f729f8752d429fdcde4927c740a9d66541b3 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 6 Apr 2021 07:06:29 +0200 +Subject: [PATCH] fix perl syntax + +--- + PerlMagick/default/Makefile.PL.in | 2 +- + PerlMagick/quantum/Makefile.PL.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PerlMagick/default/Makefile.PL.in b/PerlMagick/default/Makefile.PL.in +index 5f6cf3a0b..a71ae10ec 100644 +--- a/PerlMagick/default/Makefile.PL.in ++++ b/PerlMagick/default/Makefile.PL.in +@@ -162,7 +162,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 $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE' ++my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE'; + my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@"; + my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@"; + my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@"; +diff --git a/PerlMagick/quantum/Makefile.PL.in b/PerlMagick/quantum/Makefile.PL.in +index c2b627c1c..21a534a5d 100644 +--- a/PerlMagick/quantum/Makefile.PL.in ++++ b/PerlMagick/quantum/Makefile.PL.in +@@ -162,7 +162,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 $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE' ++my $LIBS_magick = '-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ @MATH_LIBS@ -L' . $Config{'archlib'} . '/CORE'; + my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@"; + my $LDFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@"; + my $LDDLFLAGS_magick = "-L../../magick/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@"; |