diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-devtools/m4/m4 | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.gz talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.zip |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/m4/m4')
5 files changed, 205 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 000000000..ba1a4bab4 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,33 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index e1d74db..c0e92dd 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch b/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch new file mode 100644 index 000000000..275c0b2e7 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch @@ -0,0 +1,30 @@ +Upstream-Status: Inappropriate [configuration] + +This patch fixes a build problem for m4-native experienced on Ubuntu 9.10, +where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a +symlink to itself. + +The patch comments out ac_config_links directly in configure, +as autoreconf is not actually run for m4-native. + +I believe it should be safe, as GNUmakefile is actually unpacked from +source, and what we want is to is to not touch it. + +Tested on x86_64_linux (Ubuntu 8.04 and 9.10). + +2009-11-10 Esben Haabendal <eha@doredevelopment.dk> + +diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure +--- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100 ++++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100 +@@ -14860,8 +14860,8 @@ + # only, it does not matter if we skip the link with older autoconf. + # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH + # builds, so use a shell variable to bypass this. +- GNUmakefile=GNUmakefile +- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" ++ # GNUmakefile=GNUmakefile ++ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" + + + diff --git a/yocto-poky/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch b/yocto-poky/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch new file mode 100644 index 000000000..98774535d --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch @@ -0,0 +1,77 @@ +Upstream-Status: Inappropriate [licensing] + +The older GPLv2 m4 does not work well with newer autoconf. It causes the +circular dependency as seen bellow. + Removing this m4 file which was needed only forl older autoconf + +| configure.ac:34: error: AC_REQUIRE: circular dependency of AC_GNU_SOURCE +| /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... +| ../../lib/autoconf/specific.m4:310: AC_GNU_SOURCE is expanded from... +| /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... +| configure.ac:34: the top level +| autom4te: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/m4 failed with exit status: 1 +| aclocal: /build_disk/poky_build/build1/tmp/sysroots/x86_64-linux/usr/bin/autom4te failed with exit status: 1 +| autoreconf: aclocal failed with exit status: 1 + +Nitin A Kamble <nitin.a.kamble@intel.com> +2011/03/16 + +Index: m4-1.4.9/m4/extensions.m4 +=================================================================== +--- m4-1.4.9.orig/m4/extensions.m4 ++++ m4-1.4.9/m4/extensions.m4 +@@ -6,53 +6,10 @@ + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS +-# Autoconf. Perhaps we can remove this once we can assume Autoconf +-# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly +-# enough in this area it's likely we'll need to redefine +-# AC_USE_SYSTEM_EXTENSIONS for quite some time. +- +-# AC_USE_SYSTEM_EXTENSIONS +-# ------------------------ +-# Enable extensions on systems that normally disable them, +-# typically due to standards-conformance issues. +-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], +-[ +- AC_BEFORE([$0], [AC_COMPILE_IFELSE]) +- AC_BEFORE([$0], [AC_RUN_IFELSE]) +- +- AC_REQUIRE([AC_GNU_SOURCE]) +- AC_REQUIRE([AC_AIX]) +- AC_REQUIRE([AC_MINIX]) +- +- AH_VERBATIM([__EXTENSIONS__], +-[/* Enable extensions on Solaris. */ +-#ifndef __EXTENSIONS__ +-# undef __EXTENSIONS__ +-#endif +-#ifndef _POSIX_PTHREAD_SEMANTICS +-# undef _POSIX_PTHREAD_SEMANTICS +-#endif +-#ifndef _TANDEM_SOURCE +-# undef _TANDEM_SOURCE +-#endif]) +- AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], +- [ac_cv_safe_to_define___extensions__], +- [AC_COMPILE_IFELSE( +- [AC_LANG_PROGRAM([ +-# define __EXTENSIONS__ 1 +- AC_INCLUDES_DEFAULT])], +- [ac_cv_safe_to_define___extensions__=yes], +- [ac_cv_safe_to_define___extensions__=no])]) +- test $ac_cv_safe_to_define___extensions__ = yes && +- AC_DEFINE([__EXTENSIONS__]) +- AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) +- AC_DEFINE([_TANDEM_SOURCE]) +-]) + + # gl_USE_SYSTEM_EXTENSIONS + # ------------------------ + # Enable extensions on systems that normally disable them, + # typically due to standards-conformance issues. + AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], +- [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) ++ []) diff --git a/yocto-poky/meta/recipes-devtools/m4/m4/make.patch b/yocto-poky/meta/recipes-devtools/m4/m4/make.patch new file mode 100644 index 000000000..79fb41512 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/m4/m4/make.patch @@ -0,0 +1,42 @@ +Upstream-Status: Inappropriate [embedded specific] + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- m4-1.4.2/doc/Makefile.in~make ++++ m4-1.4.2/doc/Makefile.in +@@ -57,9 +57,9 @@ + date > $(srcdir)/stamp-vti + + install: all +- $(srcdir)/../mkinstalldirs $(infodir) ++ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir) + cd $(srcdir) && for file in m4.info*; do \ +- $(INSTALL_DATA) $$file $(infodir)/$$file; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \ + done + + uninstall: +--- m4-1.4.2/src/Makefile.in~make ++++ m4-1.4.2/src/Makefile.in +@@ -35,7 +35,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + transform = @program_transform_name@ +-bindir = $(exec_prefix)/bin ++bindir = @bindir@ + + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) + LINK = $(CC) $(LDFLAGS) -o $@ +@@ -84,8 +84,8 @@ + $(LINK) ansi2knr.o $(LIBS) + + install: all +- $(srcdir)/../mkinstalldirs $(bindir) +- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'` ++ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'` + + uninstall: + rm -f $(bindir)/`echo m4 | sed '$(transform)'` diff --git a/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch b/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch new file mode 100644 index 000000000..effb353f1 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch @@ -0,0 +1,23 @@ +eglibc has remove gets starting 2.16 +therefore check for its being there before +undefining it. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: m4-1.4.17/lib/stdio.in.h +=================================================================== +--- m4-1.4.17.orig/lib/stdio.in.h 2013-10-16 14:41:01.678496227 +0300 ++++ m4-1.4.17/lib/stdio.in.h 2013-10-16 14:41:48.849427839 +0300 +@@ -717,10 +717,12 @@ + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning; besides, C11 + removed it. */ ++#if defined gets + #undef gets + #if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + #endif ++#endif + + + #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ |