summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/m4/m4
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/m4/m4')
-rw-r--r--meta/recipes-devtools/m4/m4/ac_config_links.patch30
-rw-r--r--meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch77
-rw-r--r--meta/recipes-devtools/m4/m4/make.patch42
-rw-r--r--meta/recipes-devtools/m4/m4/remove-gets.patch23
4 files changed, 172 insertions, 0 deletions
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch
new file mode 100644
index 0000000000..275c0b2e7d
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Inappropriate [configuration]
2
3This patch fixes a build problem for m4-native experienced on Ubuntu 9.10,
4where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a
5symlink to itself.
6
7The patch comments out ac_config_links directly in configure,
8as autoreconf is not actually run for m4-native.
9
10I believe it should be safe, as GNUmakefile is actually unpacked from
11source, and what we want is to is to not touch it.
12
13Tested on x86_64_linux (Ubuntu 8.04 and 9.10).
14
152009-11-10 Esben Haabendal <eha@doredevelopment.dk>
16
17diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure
18--- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100
19+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100
20@@ -14860,8 +14860,8 @@
21 # only, it does not matter if we skip the link with older autoconf.
22 # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
23 # builds, so use a shell variable to bypass this.
24- GNUmakefile=GNUmakefile
25- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
26+ # GNUmakefile=GNUmakefile
27+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
28
29
30
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..98774535d5
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch
@@ -0,0 +1,77 @@
1Upstream-Status: Inappropriate [licensing]
2
3The older GPLv2 m4 does not work well with newer autoconf. It causes the
4circular 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
16Nitin A Kamble <nitin.a.kamble@intel.com>
172011/03/16
18
19Index: 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/make.patch b/meta/recipes-devtools/m4/m4/make.patch
new file mode 100644
index 0000000000..79fb415121
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/make.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3#
4# Patch managed by http://www.holgerschurig.de/patcher.html
5#
6
7--- m4-1.4.2/doc/Makefile.in~make
8+++ m4-1.4.2/doc/Makefile.in
9@@ -57,9 +57,9 @@
10 date > $(srcdir)/stamp-vti
11
12 install: all
13- $(srcdir)/../mkinstalldirs $(infodir)
14+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
15 cd $(srcdir) && for file in m4.info*; do \
16- $(INSTALL_DATA) $$file $(infodir)/$$file; \
17+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
18 done
19
20 uninstall:
21--- m4-1.4.2/src/Makefile.in~make
22+++ m4-1.4.2/src/Makefile.in
23@@ -35,7 +35,7 @@
24 prefix = @prefix@
25 exec_prefix = @exec_prefix@
26 transform = @program_transform_name@
27-bindir = $(exec_prefix)/bin
28+bindir = @bindir@
29
30 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
31 LINK = $(CC) $(LDFLAGS) -o $@
32@@ -84,8 +84,8 @@
33 $(LINK) ansi2knr.o $(LIBS)
34
35 install: all
36- $(srcdir)/../mkinstalldirs $(bindir)
37- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'`
38+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
39+ $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'`
40
41 uninstall:
42 rm -f $(bindir)/`echo m4 | sed '$(transform)'`
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
new file mode 100644
index 0000000000..effb353f11
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/remove-gets.patch
@@ -0,0 +1,23 @@
1eglibc has remove gets starting 2.16
2therefore check for its being there before
3undefining it.
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Index: m4-1.4.17/lib/stdio.in.h
8===================================================================
9--- m4-1.4.17.orig/lib/stdio.in.h 2013-10-16 14:41:01.678496227 +0300
10+++ m4-1.4.17/lib/stdio.in.h 2013-10-16 14:41:48.849427839 +0300
11@@ -717,10 +717,12 @@
12 /* It is very rare that the developer ever has full control of stdin,
13 so any use of gets warrants an unconditional warning; besides, C11
14 removed it. */
15+#if defined gets
16 #undef gets
17 #if HAVE_RAW_DECL_GETS
18 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
19 #endif
20+#endif
21
22
23 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@