summaryrefslogtreecommitdiffstats
path: root/package/imagemagick/imagemagick-use-xml2-config.patch
diff options
context:
space:
mode:
authorJerzy Grzegorek <jerzy.grzegorek@trzebnica.net>2013-10-08 08:03:16 +0200
committerPeter Korsgaard <peter@korsgaard.com>2013-10-08 22:20:10 +0200
commitfc088e15eaaf2cb2a79febd99d28dafd7ba5faca (patch)
treebcca2ad58694239ad7710c0df43ea9d964e6d93e /package/imagemagick/imagemagick-use-xml2-config.patch
parentf65e8e31a5cbd27ae3aced271de7cffc4713ac4c (diff)
downloadbuildroot-fc088e15eaaf2cb2a79febd99d28dafd7ba5faca.tar.gz
buildroot-fc088e15eaaf2cb2a79febd99d28dafd7ba5faca.zip
imagemagick: change the patch name
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/imagemagick/imagemagick-use-xml2-config.patch')
-rw-r--r--package/imagemagick/imagemagick-use-xml2-config.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/package/imagemagick/imagemagick-use-xml2-config.patch b/package/imagemagick/imagemagick-use-xml2-config.patch
deleted file mode 100644
index bff4c73646..0000000000
--- a/package/imagemagick/imagemagick-use-xml2-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Use the detected xml2-config script
-
-The AC_CHECK_PROG() macro allows to find the location of a particular
-program. In ImageMagick, it is used to find the location of
-xml2-config, and fills it into the xml2_config
-variable. Unfortunately, the check just below hardcodes `xml2-config
---prefix`, without using the variable, which defeats the whole purpose
-of having AC_CHECK_PROG().
-
-So, let's use the ${xml2_config} variable instead. This allows to fix
-cross-compilation issues when a non-standard xml2-config location
-needs to be specified.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: imagemagick-6.6.4-8/configure.ac
-===================================================================
---- imagemagick-6.6.4-8.orig/configure.ac
-+++ imagemagick-6.6.4-8/configure.ac
-@@ -2549,7 +2549,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=`${xml2_config} --prefix`
- if test -d "${xml2_prefix}/include/libxml2"; then
- CPPFLAGS="$CPPFLAGS -I${xml2_prefix}/include/libxml2"
- fi
OpenPOWER on IntegriCloud