diff options
author | Remi Collet <remi@remirepo.net> | 2021-04-13 15:30:44 +0200 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2021-04-13 15:30:44 +0200 |
commit | ab10d7dacf6ed6491bb5fc4d08d44e4103e0a645 (patch) | |
tree | 47b76b65dc2ad621b44936fcbfbbefcf3b1645dc /ImageMagick-perl.patch | |
parent | dc7c122642a605dd55efa40298de2cbda8b3a0ff (diff) |
update to version 6.9.12 patch level 7
drop patch merged upstream
Diffstat (limited to 'ImageMagick-perl.patch')
-rw-r--r-- | ImageMagick-perl.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/ImageMagick-perl.patch b/ImageMagick-perl.patch deleted file mode 100644 index e971109..0000000 --- a/ImageMagick-perl.patch +++ /dev/null @@ -1,36 +0,0 @@ -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@"; |