diff options
Diffstat (limited to 'meta/recipes-devtools/m4')
| -rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.9.inc | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch | 77 | ||||
| -rw-r--r-- | meta/recipes-devtools/m4/m4_1.4.9.bb | 3 |
3 files changed, 0 insertions, 93 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.9.inc b/meta/recipes-devtools/m4/m4-1.4.9.inc deleted file mode 100644 index aab2c1efa2..0000000000 --- a/meta/recipes-devtools/m4/m4-1.4.9.inc +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | require m4.inc | ||
| 2 | |||
| 3 | LICENSE = "GPLv2" | ||
| 4 | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ | ||
| 6 | file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c" | ||
| 7 | |||
| 8 | PR = "r2" | ||
| 9 | SRC_URI += "file://fix_for_circular_dependency.patch" | ||
| 10 | |||
| 11 | SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5" | ||
| 12 | SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47" | ||
| 13 | |||
diff --git a/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch b/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch deleted file mode 100644 index 98774535d5..0000000000 --- a/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [licensing] | ||
| 2 | |||
| 3 | The older GPLv2 m4 does not work well with newer autoconf. It causes the | ||
| 4 | circular dependency as seen bellow. | ||
| 5 | Removing this m4 file which was needed only forl older autoconf | ||
| 6 | |||
| 7 | | configure.ac:34: error: AC_REQUIRE: circular dependency of AC_GNU_SOURCE | ||
| 8 | | /build_disk/poky_build/build1/tmp/work/i586-poky-linux/m4-1.4.9-r0/m4-1.4.9/m4/extensions.m4:19: AC_USE_SYSTEM_EXTENSIONS is expanded from... | ||
| 9 | | ../../lib/autoconf/specific.m4:310: AC_GNU_SOURCE is expanded from... | ||
| 10 | | /build_disk/poky_build/build1/tmp/work/i586-poky-linux/m4-1.4.9-r0/m4-1.4.9/m4/gnulib-comp.m4:21: M4_EARLY is expanded from... | ||
| 11 | | configure.ac:34: the top level | ||
| 12 | | autom4te: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/m4 failed with exit status: 1 | ||
| 13 | | aclocal: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/autom4te failed with exit status: 1 | ||
| 14 | | autoreconf: aclocal failed with exit status: 1 | ||
| 15 | |||
| 16 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
| 17 | 2011/03/16 | ||
| 18 | |||
| 19 | Index: m4-1.4.9/m4/extensions.m4 | ||
| 20 | =================================================================== | ||
| 21 | --- m4-1.4.9.orig/m4/extensions.m4 | ||
| 22 | +++ m4-1.4.9/m4/extensions.m4 | ||
| 23 | @@ -6,53 +6,10 @@ | ||
| 24 | # gives unlimited permission to copy and/or distribute it, | ||
| 25 | # with or without modifications, as long as this notice is preserved. | ||
| 26 | |||
| 27 | -# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS | ||
| 28 | -# Autoconf. Perhaps we can remove this once we can assume Autoconf | ||
| 29 | -# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly | ||
| 30 | -# enough in this area it's likely we'll need to redefine | ||
| 31 | -# AC_USE_SYSTEM_EXTENSIONS for quite some time. | ||
| 32 | - | ||
| 33 | -# AC_USE_SYSTEM_EXTENSIONS | ||
| 34 | -# ------------------------ | ||
| 35 | -# Enable extensions on systems that normally disable them, | ||
| 36 | -# typically due to standards-conformance issues. | ||
| 37 | -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
| 38 | -[ | ||
| 39 | - AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
| 40 | - AC_BEFORE([$0], [AC_RUN_IFELSE]) | ||
| 41 | - | ||
| 42 | - AC_REQUIRE([AC_GNU_SOURCE]) | ||
| 43 | - AC_REQUIRE([AC_AIX]) | ||
| 44 | - AC_REQUIRE([AC_MINIX]) | ||
| 45 | - | ||
| 46 | - AH_VERBATIM([__EXTENSIONS__], | ||
| 47 | -[/* Enable extensions on Solaris. */ | ||
| 48 | -#ifndef __EXTENSIONS__ | ||
| 49 | -# undef __EXTENSIONS__ | ||
| 50 | -#endif | ||
| 51 | -#ifndef _POSIX_PTHREAD_SEMANTICS | ||
| 52 | -# undef _POSIX_PTHREAD_SEMANTICS | ||
| 53 | -#endif | ||
| 54 | -#ifndef _TANDEM_SOURCE | ||
| 55 | -# undef _TANDEM_SOURCE | ||
| 56 | -#endif]) | ||
| 57 | - AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], | ||
| 58 | - [ac_cv_safe_to_define___extensions__], | ||
| 59 | - [AC_COMPILE_IFELSE( | ||
| 60 | - [AC_LANG_PROGRAM([ | ||
| 61 | -# define __EXTENSIONS__ 1 | ||
| 62 | - AC_INCLUDES_DEFAULT])], | ||
| 63 | - [ac_cv_safe_to_define___extensions__=yes], | ||
| 64 | - [ac_cv_safe_to_define___extensions__=no])]) | ||
| 65 | - test $ac_cv_safe_to_define___extensions__ = yes && | ||
| 66 | - AC_DEFINE([__EXTENSIONS__]) | ||
| 67 | - AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
| 68 | - AC_DEFINE([_TANDEM_SOURCE]) | ||
| 69 | -]) | ||
| 70 | |||
| 71 | # gl_USE_SYSTEM_EXTENSIONS | ||
| 72 | # ------------------------ | ||
| 73 | # Enable extensions on systems that normally disable them, | ||
| 74 | # typically due to standards-conformance issues. | ||
| 75 | AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], | ||
| 76 | - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) | ||
| 77 | + []) | ||
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/meta/recipes-devtools/m4/m4_1.4.9.bb deleted file mode 100644 index b12c0adf3a..0000000000 --- a/meta/recipes-devtools/m4/m4_1.4.9.bb +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | require m4-${PV}.inc | ||
| 2 | |||
| 3 | BBCLASSEXTEND = "nativesdk" | ||
