diff options
Diffstat (limited to 'meta/recipes-devtools/m4')
-rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.17.inc | 18 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.19.inc | 61 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.9.inc | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4-native_1.4.19.bb (renamed from meta/recipes-devtools/m4/m4-native_1.4.17.bb) | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4.inc | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/ac_config_links.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/fix_for_circular_dependency.patch | 77 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/make.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/remove-gets.patch | 23 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/run-ptest | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/serial-tests-config.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4_1.4.19.bb (renamed from meta/recipes-devtools/m4/m4_1.4.17.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4_1.4.9.bb | 3 |
14 files changed, 112 insertions, 227 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.17.inc b/meta/recipes-devtools/m4/m4-1.4.17.inc deleted file mode 100644 index 8ea4e04907..0000000000 --- a/meta/recipes-devtools/m4/m4-1.4.17.inc +++ /dev/null @@ -1,18 +0,0 @@ -require m4.inc - -EXTRA_OECONF += "--without-libsigsegv-prefix" - -LICENSE = "GPLv3" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" - -SRC_URI += "file://ac_config_links.patch \ - file://remove-gets.patch \ - " - -SRC_URI_append_class-target = "\ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - " -SRC_URI[md5sum] = "a5e9954b1dae036762f7b13673a2cf76" -SRC_URI[sha256sum] = "3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e" diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc b/meta/recipes-devtools/m4/m4-1.4.19.inc new file mode 100644 index 0000000000..0516e49552 --- /dev/null +++ b/meta/recipes-devtools/m4/m4-1.4.19.inc @@ -0,0 +1,61 @@ +SUMMARY = "Traditional Unix macro processor" +HOMEPAGE = "https://www.gnu.org/software/m4/m4.html" +DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \ +compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \ +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc." + +inherit autotools texinfo ptest gettext + +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ + file://ac_config_links.patch \ + " +SRC_URI:append:class-target = " file://run-ptest \ + file://serial-tests-config.patch \ + " + +SRC_URI[md5sum] = "f4a2b0284d80353b995f8ef2385ed73c" +SRC_URI[sha256sum] = "3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70" + +LICENSE = "GPLv3" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\ + file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" + +# Fix "Argument list too long" error when len(TMPDIR) = 410 +acpaths = "-I ./m4" + +EXTRA_OECONF += "--without-libsigsegv-prefix" + +EXTRA_OEMAKE += "'infodir=${infodir}'" + +do_compile_ptest() { + cd ${B}/tests + sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile + oe_runmake buildtest-TESTS +} + +do_install_ptest() { + cp -r ${B}/tests ${D}${PTEST_PATH} + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile + sed -i -e "s;LOCALE_FR='fr_FR';LOCALE_FR='fr_FR.iso88591';g" \ + -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile + find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} + cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/ + sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh + chmod 0755 ${D}${PTEST_PATH}/tests/test-mbrtowc-w32-1.sh ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ + ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \ + ${D}${PTEST_PATH}/tests/test-xalloc-die + + ln -s ptest ${D}${libdir}/${BPN}/${BP} +} + + +RDEPENDS:${PN}-ptest += "make coreutils diffutils" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ + locale-base-fr-fr.iso-8859-1 \ +" + +INSANE_SKIP:${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "rpaths" + 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 @@ -require m4.inc - -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\ - file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c" - -PR = "r2" -SRC_URI += "file://fix_for_circular_dependency.patch" - -SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5" -SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47" - diff --git a/meta/recipes-devtools/m4/m4-native_1.4.17.bb b/meta/recipes-devtools/m4/m4-native_1.4.19.bb index 06d8aa244e..407ad89330 100644 --- a/meta/recipes-devtools/m4/m4-native_1.4.17.bb +++ b/meta/recipes-devtools/m4/m4-native_1.4.19.bb @@ -11,3 +11,4 @@ do_configure() { oe_runconf } +UPSTREAM_CHECK_URI = "${GNU_MIRROR}/m4/" diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc deleted file mode 100644 index 4a83929f0c..0000000000 --- a/meta/recipes-devtools/m4/m4.inc +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Traditional Unix macro processor" -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \ -compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \ -GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc." - -inherit autotools texinfo - -EXTRA_OEMAKE += "'infodir=${infodir}'" -LDFLAGS_prepend_libc-uclibc = " -lrt " -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" diff --git a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index abdfa2a50b..0000000000 --- a/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -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: Not Required - -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/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch index 275c0b2e7d..39fcd91896 100644 --- a/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch @@ -12,19 +12,26 @@ 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> +2009-11-10 Esben Haabendal <eha@doredevelopment.dk> +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -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 @@ +diff --git a/configure b/configure +index 883336a..6343a34 100755 +--- a/configure ++++ b/configure +@@ -37061,8 +37061,8 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h # 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" - ++# GNUmakefile=GNUmakefile ++# ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" + LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" +-- +2.25.1 + 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 @@ -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/meta/recipes-devtools/m4/m4/make.patch b/meta/recipes-devtools/m4/m4/make.patch deleted file mode 100644 index 79fb415121..0000000000 --- a/meta/recipes-devtools/m4/m4/make.patch +++ /dev/null @@ -1,42 +0,0 @@ -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/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch deleted file mode 100644 index effb353f11..0000000000 --- a/meta/recipes-devtools/m4/m4/remove-gets.patch +++ /dev/null @@ -1,23 +0,0 @@ -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@ diff --git a/meta/recipes-devtools/m4/m4/run-ptest b/meta/recipes-devtools/m4/m4/run-ptest new file mode 100644 index 0000000000..5c0fe93357 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh +# +#This script is used to run m4 test suites +cd tests +make -k runtest-TESTS top_srcdir=.. srcdir=. diff --git a/meta/recipes-devtools/m4/m4/serial-tests-config.patch b/meta/recipes-devtools/m4/m4/serial-tests-config.patch new file mode 100644 index 0000000000..34e6ad801e --- /dev/null +++ b/meta/recipes-devtools/m4/m4/serial-tests-config.patch @@ -0,0 +1,30 @@ +From ab8491111b4578db5b735c6466187775e1855f18 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 23 Apr 2019 15:35:00 +0800 +Subject: [PATCH] add a patch to use serial-tests config needed by ptest + +Add serial-tests support, ptest need it. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 78b8788..931fa6f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [bug-m4@gnu.org]) + AC_CONFIG_AUX_DIR([build-aux]) + +-AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests ++AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests serial-tests + silent-rules subdir-objects gnu]) + AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. + +-- +2.7.4 + diff --git a/meta/recipes-devtools/m4/m4_1.4.17.bb b/meta/recipes-devtools/m4/m4_1.4.19.bb index b12c0adf3a..b12c0adf3a 100644 --- a/meta/recipes-devtools/m4/m4_1.4.17.bb +++ b/meta/recipes-devtools/m4/m4_1.4.19.bb 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 @@ -require m4-${PV}.inc - -BBCLASSEXTEND = "nativesdk" |