diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
| commit | 82b51b6abd7b43ae6fa1c7d01b780d0c99d22804 (patch) | |
| tree | b1455904c992c92a18dc5f48253d0f37c4ff7590 /recipes/imagemagick/files/openm4-autoconf-fix.patch | |
| parent | 5eef2a8892b12b3215f52065c2c177f576c41959 (diff) | |
| parent | d2bd4a770d2a5b3fd56bd3a8584935240d9012f8 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/imagemagick/files/openm4-autoconf-fix.patch')
| -rw-r--r-- | recipes/imagemagick/files/openm4-autoconf-fix.patch | 27 |
1 files changed, 27 insertions, 0 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 |