diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-01-21 05:18:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-01-21 05:18:29 +0000 |
| commit | 4f59d12327f308caad83ce8fec3c6179e708858c (patch) | |
| tree | eaa497a860f95e84c0c2a039e7869ad324c84e6f /media-gfx/imagemagick/files | |
| parent | version bump (bug #453118) (diff) | |
| download | historical-4f59d12327f308caad83ce8fec3c6179e708858c.tar.gz historical-4f59d12327f308caad83ce8fec3c6179e708858c.tar.bz2 historical-4f59d12327f308caad83ce8fec3c6179e708858c.zip | |
Fix cross-compiling with freetype while upstream sorts it out.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'media-gfx/imagemagick/files')
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch new file mode 100644 index 000000000000..ce1332f335a2 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-6.7.8.7-freetype.patch @@ -0,0 +1,32 @@ +https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940 + +--- a/configure ++++ b/configure +@@ -26488,7 +26488,6 @@ + + # Assume that delegate headers reside under same directory as ImageMagick + # installation prefix. +-MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS" + + # + # Find the X11 RGB database +@@ -29490,8 +29490,8 @@ + then + freetype_prefix=`${freetype_config} --prefix` + freetype_exec_prefix=`${freetype_config} --exec-prefix` +- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib" +- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2" ++ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`" ++ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`" + fi + + dnl First see if there is a library +@@ -35767,7 +35767,7 @@ + MAGICK_CXXFLAGS="$CXXFLAGS" + MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'` + MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'` +-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS" ++MAGICK_LDFLAGS="$LDFLAGS" + MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL" + + |