You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
1.5 KiB
24 lines
1.5 KiB
Index: PerlMagick/Makefile.PL.in |
|
--- PerlMagick/Makefile.PL.in.orig 2016-05-01 17:35:44.261422000 +0200 |
|
+++ PerlMagick/Makefile.PL.in 2016-05-01 17:37:40.281425610 +0200 |
|
@@ -162,7 +162,7 @@ |
|
|
|
# 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../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ -lperl @MATH_LIBS@'; |
|
+my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore -lperl @MATH_LIBS@ @LDFLAGS@ -llcms -ltiff -lfreetype -llqr-1 -ljasper -ljpeg -lpng -lglib2 -lgobject2 -lgio2 -lbz2 -lxml2 -lintl -liconv -lz -lm'; |
|
my $CCFLAGS_magick = "$Config{'ccflags'} @CFLAGS@"; |
|
my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'ldflags'} @LDFLAGS@"; |
|
my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ $Config{'lddlflags'} @LDFLAGS@"; |
|
Index: MagickCore/studio.h |
|
--- MagickCore/studio.h.orig 2016-04-30 20:57:55.000000000 +0200 |
|
+++ MagickCore/studio.h 2016-05-01 18:40:18.861474680 +0200 |
|
@@ -168,7 +168,7 @@ |
|
#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(MAGICKCORE_POSIX_SUPPORT) |
|
# include <sys/types.h> |
|
# include <sys/stat.h> |
|
-# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H) |
|
+# if defined(MAGICKCORE_HAVE_SYS_TIMEB_H) && !defined(__FreeBSD__) |
|
# include <sys/timeb.h> |
|
# endif |
|
# if defined(MAGICKCORE_POSIX_SUPPORT)
|
|
|