diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2010-12-22 18:25:20 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-12-22 22:14:36 +0100 |
| commit | c5a195e4038af111fafc452e030e2a0a83ec1d9e (patch) | |
| tree | e378ffad6981751d117751f68d61289460d2aaf2 /package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch | |
| parent | 4c31d75ca447c9d27cd57233caffedef1c36ee4b (diff) | |
imagemagick: add patch to fix libxml2 issue and remove useless patch
The patch imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
was not applied anymore due to a difference in the version number, and
it didn't prevent imagemagick to be built. It was introduced several
years ago together with the ImageMagick package itself, so presumably
it is no longer needed.
The new patch allows ImageMagick to use the correct xml2-config script
to get the proper location for XML2 headers and libraries. Otherwise,
-I/usr/include/libxml2 is found in the compile flags.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch')
| -rw-r--r-- | package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch b/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch new file mode 100644 index 000000000..bff4c7364 --- /dev/null +++ b/package/imagemagick/imagemagick-6.6.4-8-use-xml2-config.patch @@ -0,0 +1,31 @@ +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 |