Skip to contentSkip to conversation

imagemagick_6.3.5-10.bb: openm4 fix

PATCH New Adrian Alonso 1 participant 2 messages Mar 30, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 imagemagick_6.3.5-10.bb: openm4 fix

* m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or newer.
* 2008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]>
* Bruno Haible <[EMAIL PROTECTED]>
* ref: http://www.mail-archive.com/[email protected]/msg12387.html

---
 recipes/imagemagick/imagemagick_6.3.5-10.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
recipes/imagemagick/imagemagick_6.3.5-10.bb +2 -1
index 58f3b23..a6a7a7e 100644
@@ -8,7 +8,8 @@ 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"
 
Signature · 1 line
1.6.6.1
#1 lore raw

PATCH 2/2 openm4-autoconf-fix.patch: new file

---
 .../imagemagick/files/openm4-autoconf-fix.patch    |   27 ++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 recipes/imagemagick/files/openm4-autoconf-fix.patch
recipes/imagemagick/files/openm4-autoconf-fix.patch new file +27 -0
new file mode 100644
index 0000000..8ad882b
@@ -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

--
1.6.6.1