diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2006-09-21 02:22:12 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2006-09-21 02:22:12 +0000 |
| commit | 62a37d10a1ebc6547aa768f33bbc85499bef8fc6 (patch) | |
| tree | 1f6afbf05d43fc557c942ecb73e5be9996ff31de /media-gfx/imagemagick/files | |
| parent | More profile work so the gcc-4.1.1 stuff will work right now. (diff) | |
| download | historical-62a37d10a1ebc6547aa768f33bbc85499bef8fc6.tar.gz historical-62a37d10a1ebc6547aa768f33bbc85499bef8fc6.tar.bz2 historical-62a37d10a1ebc6547aa768f33bbc85499bef8fc6.zip | |
Closing up bug 121142, patch courtest of Sven - thanks Sven :) PerlMagick now builds cleanly on the first try
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'media-gfx/imagemagick/files')
| -rw-r--r-- | media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 | 3 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-perl.patch | 43 |
2 files changed, 46 insertions, 0 deletions
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 new file mode 100644 index 000000000000..945ff71d74a2 --- /dev/null +++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5-r1 @@ -0,0 +1,3 @@ +MD5 c927f9afcac089e47a166b5c4476a8d8 ImageMagick-6.2.9-5.tar.bz2 5378476 +RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 ImageMagick-6.2.9-5.tar.bz2 5378476 +SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05 ImageMagick-6.2.9-5.tar.bz2 5378476 diff --git a/media-gfx/imagemagick/files/imagemagick-perl.patch b/media-gfx/imagemagick/files/imagemagick-perl.patch new file mode 100644 index 000000000000..7d87c70268a1 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-perl.patch @@ -0,0 +1,43 @@ +Index: PerlMagick/Makefile.am
+===================================================================
+--- PerlMagick/Makefile.am (Revision 4660)
++++ PerlMagick/Makefile.am (Arbeitskopie)
+@@ -45,11 +45,10 @@
+ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+
+ install-exec-perl: $(PERLMAKEFILE)
+- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+- $(MAKE) CC='@CC@' install && \
+- $(MAKE) clean && rm -f Makefile.old )
++ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
+
+-all-perl:
++all-perl: $(PERLMAKEFILE)
++ cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
+
+ uninstall-exec-perl: $(PERLMAKEFILE)
+ echo "Uninstall not supported for PerlMagick"
+Index: PerlMagick/Makefile.PL.in
+===================================================================
+--- PerlMagick/Makefile.PL.in (Revision 4660)
++++ PerlMagick/Makefile.PL.in (Arbeitskopie)
+@@ -53,16 +53,16 @@
+ 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@",
+
+ # Linker flags for building an executable
+- 'LDFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",
++ 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}",
+
+ # Linker flags for building a dynamically loadable module
+- 'LDDLFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",
++ 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}",
+
+ # Install PerlMagick binary into ImageMagick bin directory
+ 'INSTALLBIN' => '@BIN_DIR@',
+
+ # Library specification
+- 'LIBS' => ['-lMagick @MAGICK_DEP_LIBS@'],
++ 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],
+
+ # Perl binary name (if a Perl binary is built)
+ 'MAP_TARGET' => 'PerlMagick',
|