diff options
| author | nibbles 2bits | 2012-04-25 15:23:04 -0700 |
|---|---|---|
| committer | Jack Nagel | 2012-05-06 15:43:57 -0500 |
| commit | a3f66cdb0a2d2351b5056dba7a69f19419143345 (patch) | |
| tree | 3e4337ee5b8ac6dc6eaab3f570f26d89085b7e9b /Library/Formula | |
| parent | 69b98236dd0b34e155d66e1c25b51ef16e873809 (diff) | |
| download | homebrew-a3f66cdb0a2d2351b5056dba7a69f19419143345.tar.bz2 | |
Imagemagick: patch for xml2-config
Imagemagick-6.7.x uses libxml2, but Apple changed the file
`xml2-config` starting in Mt. Lion, removing the `--prefix` flag.
That breaks Imagemagick, which uses it to find the library.
Because all versions of OSX have libxml2 in the same location,
this commit is safe for all users.
* Patch `configure` to not run `xml2-config --prefix` by placing
the value it returns, `/usr`, into the corresonding variable.
Fixes #11789.
Closes #11883.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/imagemagick.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index b73345fde..abb2437ae 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -84,6 +84,13 @@ class Imagemagick < Formula path.extname == '.la' end + def patches + # Fixes xml2-config that can be missing --prefix. See issue #11789 + # Remove if the final Mt. Lion xml2-config supports --prefix. + # Not reporting this upstream until the final Mt. Lion is released. + DATA + end + def options [ ['--with-ghostscript', 'Compile against ghostscript (not recommended.)'], @@ -148,3 +155,16 @@ class Imagemagick < Formula system "#{bin}/identify", "/Library/Application Support/Apple/iChat Icons/Flags/Argentina.gif" end end + +__END__ +--- a/configure 2012-02-25 09:03:23.000000000 -0800 ++++ b/configure 2012-04-26 03:32:15.000000000 -0700 +@@ -31924,7 +31924,7 @@ + # Debian installs libxml headers under /usr/include/libxml2/libxml with + # the shared library installed under /usr/lib, whereas the package + # installs itself under $prefix/libxml and $prefix/lib. +- xml2_prefix=`xml2-config --prefix` ++ xml2_prefix=/usr + if test -d "${xml2_prefix}/include/libxml2"; then + CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2" + fi |