From: Thomas Petazzoni Date: Wed, 22 Dec 2010 17:25:20 +0000 (+0100) Subject: imagemagick: add patch to fix libxml2 issue and remove useless patch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5a195e4038af111fafc452e030e2a0a83ec1d9e;p=buildroot.git 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 Signed-off-by: Peter Korsgaard --- 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 0000000000..bff4c73646 --- /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 +--- + 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 diff --git a/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch b/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch deleted file mode 100644 index 66a6747fd6..0000000000 --- a/package/imagemagick/imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2010-09-26 17:05:45.000000000 -0700 -+++ b/configure 2010-09-30 23:47:09.000000000 -0700 -@@ -20354,6 +20354,8 @@ done - - ac_fn_c_check_type "$LINENO" "error_t" "ac_cv_type_error_t" "#if defined(HAVE_ARGZ_H) - # include -+#else -+# include - #endif - " - if test "x$ac_cv_type_error_t" = xyes; then : diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 30158e0098..aecf7ae20d 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -9,6 +9,7 @@ IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick IMAGEMAGICK_LIBTOOL_PATCH = NO IMAGEMAGICK_INSTALL_STAGING = YES +IMAGEMAGICK_AUTORECONF = YES ifeq ($(BR2_LARGEFILE),y) IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64 @@ -66,6 +67,7 @@ endif ifeq ($(BR2_PACKAGE_LIBXML2),y) IMAGEMAGICK_CONF_OPT += --with-xml +IMAGEMAGICK_CONF_ENV += ac_cv_prog_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config IMAGEMAGICK_DEPENDENCIES += libxml2 else IMAGEMAGICK_CONF_OPT += --without-xml