aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/imagemagick/files/openm4-autoconf-fix.patch27
-rw-r--r--recipes/imagemagick/imagemagick_6.3.5-10.bb5
2 files changed, 30 insertions, 2 deletions
diff --git a/recipes/imagemagick/files/openm4-autoconf-fix.patch b/recipes/imagemagick/files/openm4-autoconf-fix.patch
new file mode 100644
index 0000000000..dc08f73a4a
--- /dev/null
+++ b/recipes/imagemagick/files/openm4-autoconf-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/m4/openmp.m4 b/m4/openmp.m4
+index e7b0e7b..dbfbece 100644
+--- a/m4/openmp.m4
++++ b/m4/openmp.m4
+@@ -1,10 +1,12 @@
+-# openmp.m4 serial 4
+-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
++# openmp.m4 serial 5
++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ dnl This file can be removed once we assume autoconf >= 2.62.
++dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different
++m4_ifdef([AC_OPENMP], [], [
+
+ # _AC_LANG_OPENMP
+ # ---------------
+@@ -92,3 +94,5 @@ AC_DEFUN([AC_OPENMP],
+ fi
+ AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
+ ])
++
++])
+--
+1.6.6.1
diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb
index 58f3b2327f..cc7397c16f 100644
--- a/recipes/imagemagick/imagemagick_6.3.5-10.bb
+++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "ImageMagick is an image convertion tools"
SECTION = "console/utils"
LICENSE = "GPL"
DEPENDS = "tiff jpeg libpng librsvg tiff zlib"
-PR = "r8"
+PR = "r9"
SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
file://PerlMagic_MakePatch;patch=1 \
file://makefile-am.patch;patch=1 \
file://binconfig-fixes.patch;patch=1 \
- file://fix_open_file.patch;patch=1 "
+ file://fix_open_file.patch;patch=1 \
+ file://openm4-autoconf-fix.patch;patch=1"
IMVER = "6.3.5"