summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-03-15 06:36:54 -0700
committerSaul Wold <sgw@linux.intel.com>2011-03-16 17:46:48 -0700
commit47bbe6afe7c3977776cf54dd13bcf7953353c823 (patch)
treec48d04a9db953c6aecbea602db388114977cd3a8 /meta/recipes-devtools
parent76f0cbaf1f16a4a22022b1a3fb2aa26a4f33a089 (diff)
downloadpoky-47bbe6afe7c3977776cf54dd13bcf7953353c823.tar.gz
m4: bring back GPLv2 version 1.4.9 of m4 recipe
Note: Downgrading of m4 would require rebuilding of the autoconf Fixed circular depedency with the newer autoconf (From OE-Core rev: b581c965b4fbaaa819aa3809db037578f61a56eb) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/m4/m4-native_1.4.9.bb12
-rw-r--r--meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch75
-rw-r--r--meta/recipes-devtools/m4/m4_1.4.9.bb18
3 files changed, 105 insertions, 0 deletions
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.9.bb b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
new file mode 100644
index 0000000000..fa871b38ae
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
@@ -0,0 +1,12 @@
1require m4_${PV}.bb
2inherit native
3
4INHIBIT_AUTOTOOLS_DEPS = "1"
5DEPENDS += "gnu-config-native"
6
7do_configure() {
8 install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
9 install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
10 oe_runconf
11}
12
diff --git a/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch b/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
new file mode 100644
index 0000000000..ba51d87d22
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
@@ -0,0 +1,75 @@
1The older GPLv2 m4 does not work well with newer autoconf. It causes the
2circular dependency as seen bellow.
3 Removing this m4 file which was needed only forl older autoconf
4
5| configure.ac:34: error: AC_REQUIRE: circular dependency of AC_GNU_SOURCE
6| /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...
7| ../../lib/autoconf/specific.m4:310: AC_GNU_SOURCE is expanded from...
8| /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...
9| configure.ac:34: the top level
10| autom4te: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/m4 failed with exit status: 1
11| aclocal: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/autom4te failed with exit status: 1
12| autoreconf: aclocal failed with exit status: 1
13
14Nitin A Kamble <nitin.a.kamble@intel.com>
152011/03/16
16
17Index: m4-1.4.9/m4/extensions.m4
18===================================================================
19--- m4-1.4.9.orig/m4/extensions.m4
20+++ m4-1.4.9/m4/extensions.m4
21@@ -6,53 +6,10 @@
22 # gives unlimited permission to copy and/or distribute it,
23 # with or without modifications, as long as this notice is preserved.
24
25-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
26-# Autoconf. Perhaps we can remove this once we can assume Autoconf
27-# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
28-# enough in this area it's likely we'll need to redefine
29-# AC_USE_SYSTEM_EXTENSIONS for quite some time.
30-
31-# AC_USE_SYSTEM_EXTENSIONS
32-# ------------------------
33-# Enable extensions on systems that normally disable them,
34-# typically due to standards-conformance issues.
35-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
36-[
37- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
38- AC_BEFORE([$0], [AC_RUN_IFELSE])
39-
40- AC_REQUIRE([AC_GNU_SOURCE])
41- AC_REQUIRE([AC_AIX])
42- AC_REQUIRE([AC_MINIX])
43-
44- AH_VERBATIM([__EXTENSIONS__],
45-[/* Enable extensions on Solaris. */
46-#ifndef __EXTENSIONS__
47-# undef __EXTENSIONS__
48-#endif
49-#ifndef _POSIX_PTHREAD_SEMANTICS
50-# undef _POSIX_PTHREAD_SEMANTICS
51-#endif
52-#ifndef _TANDEM_SOURCE
53-# undef _TANDEM_SOURCE
54-#endif])
55- AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
56- [ac_cv_safe_to_define___extensions__],
57- [AC_COMPILE_IFELSE(
58- [AC_LANG_PROGRAM([
59-# define __EXTENSIONS__ 1
60- AC_INCLUDES_DEFAULT])],
61- [ac_cv_safe_to_define___extensions__=yes],
62- [ac_cv_safe_to_define___extensions__=no])])
63- test $ac_cv_safe_to_define___extensions__ = yes &&
64- AC_DEFINE([__EXTENSIONS__])
65- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
66- AC_DEFINE([_TANDEM_SOURCE])
67-])
68
69 # gl_USE_SYSTEM_EXTENSIONS
70 # ------------------------
71 # Enable extensions on systems that normally disable them,
72 # typically due to standards-conformance issues.
73 AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
74- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
75+ [])
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/meta/recipes-devtools/m4/m4_1.4.9.bb
new file mode 100644
index 0000000000..94c8bdec1c
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4_1.4.9.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Traditional Unix macro processor"
2DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \
3compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
4GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
7 file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
8
9PR = "r0"
10SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
11 file://fix_for_circular_dependency.patch "
12
13SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5"
14SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47"
15
16inherit autotools
17
18EXTRA_OEMAKE += "'infodir=${infodir}'"