diff options
Diffstat (limited to 'meta/recipes-devtools/m4')
-rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.20.inc (renamed from meta/recipes-devtools/m4/m4-1.4.19.inc) | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4-native_1.4.20.bb (renamed from meta/recipes-devtools/m4/m4-native_1.4.19.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch | 49 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch | 133 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/ac_config_links.patch | 37 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/serial-tests-config.patch | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4_1.4.20.bb (renamed from meta/recipes-devtools/m4/m4_1.4.19.bb) | 0 |
9 files changed, 144 insertions, 152 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc b/meta/recipes-devtools/m4/m4-1.4.20.inc index fcc9e58270..aad57b8b64 100644 --- a/meta/recipes-devtools/m4/m4-1.4.19.inc +++ b/meta/recipes-devtools/m4/m4-1.4.20.inc | |||
@@ -7,25 +7,19 @@ GNU M4 also has built-in functions for including files, running shell commands, | |||
7 | inherit autotools texinfo ptest gettext | 7 | inherit autotools texinfo ptest gettext |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ | 9 | SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ |
10 | file://ac_config_links.patch \ | 10 | file://0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch \ |
11 | file://0001-sigsegv-Fix-build-on-ppc-musl.patch \ | ||
12 | file://0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch \ | ||
13 | " | 11 | " |
14 | SRC_URI:append:class-target = " file://run-ptest \ | 12 | SRC_URI:append:class-target = " file://run-ptest \ |
15 | file://serial-tests-config.patch \ | 13 | file://serial-tests-config.patch \ |
16 | " | 14 | " |
17 | 15 | ||
18 | SRC_URI[md5sum] = "f4a2b0284d80353b995f8ef2385ed73c" | 16 | SRC_URI[sha256sum] = "6ac4fc31ce440debe63987c2ebbf9d7b6634e67a7c3279257dc7361de8bdb3ef" |
19 | SRC_URI[sha256sum] = "3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70" | ||
20 | 17 | ||
21 | LICENSE = "GPL-3.0-only" | 18 | LICENSE = "GPL-3.0-only" |
22 | 19 | ||
23 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\ | 20 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\ |
24 | file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" | 21 | file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" |
25 | 22 | ||
26 | # Fix "Argument list too long" error when len(TMPDIR) = 410 | ||
27 | acpaths = "-I ./m4" | ||
28 | |||
29 | EXTRA_OECONF += "--without-libsigsegv-prefix" | 23 | EXTRA_OECONF += "--without-libsigsegv-prefix" |
30 | 24 | ||
31 | EXTRA_OEMAKE += "'infodir=${infodir}'" | 25 | EXTRA_OEMAKE += "'infodir=${infodir}'" |
@@ -33,21 +27,18 @@ EXTRA_OEMAKE += "'infodir=${infodir}'" | |||
33 | do_compile_ptest() { | 27 | do_compile_ptest() { |
34 | cd ${B}/tests | 28 | cd ${B}/tests |
35 | sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile | 29 | sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile |
36 | oe_runmake buildtest-TESTS | 30 | oe_runmake CPPFLAGS="-DSRCDIR=\\\"${PTEST_PATH}/tests/\\\"" buildtest-TESTS |
37 | } | 31 | } |
38 | 32 | ||
39 | do_install_ptest() { | 33 | do_install_ptest() { |
40 | cp -r ${B}/tests ${D}${PTEST_PATH} | 34 | cp -r ${B}/tests ${D}${PTEST_PATH} |
41 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 35 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
36 | cp -r ${S}/build-aux ${D}${PTEST_PATH}/tests/ | ||
42 | sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile | 37 | sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile |
43 | find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} | 38 | find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} |
44 | cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/ | 39 | chmod 0755 ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ |
45 | sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh | ||
46 | chmod 0755 ${D}${PTEST_PATH}/tests/test-mbrtowc-w32-1.sh ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ | ||
47 | ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \ | 40 | ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \ |
48 | ${D}${PTEST_PATH}/tests/test-xalloc-die | 41 | ${D}${PTEST_PATH}/tests/test-xalloc-die |
49 | |||
50 | ln -s ptest ${D}${libdir}/${BPN}/${BP} | ||
51 | } | 42 | } |
52 | 43 | ||
53 | do_install_ptest:append:libc-glibc() { | 44 | do_install_ptest:append:libc-glibc() { |
@@ -55,13 +46,9 @@ do_install_ptest:append:libc-glibc() { | |||
55 | -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile | 46 | -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile |
56 | } | 47 | } |
57 | 48 | ||
58 | RDEPENDS:${PN}-ptest += "make coreutils diffutils bash" | 49 | RDEPENDS:${PN}-ptest += "make coreutils diffutils bash locale-base-fr-fr" |
50 | |||
59 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | 51 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ |
60 | locale-base-fr-fr \ | ||
61 | locale-base-fr-fr.iso-8859-1 \ | 52 | locale-base-fr-fr.iso-8859-1 \ |
62 | glibc-gconv-iso8859-1 \ | 53 | glibc-gconv-iso8859-1 \ |
63 | " | 54 | " |
64 | |||
65 | INSANE_SKIP:${PN}-ptest += "ldflags" | ||
66 | INSANE_SKIP:${PN}-ptest += "rpaths" | ||
67 | |||
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.19.bb b/meta/recipes-devtools/m4/m4-native_1.4.20.bb index 407ad89330..407ad89330 100644 --- a/meta/recipes-devtools/m4/m4-native_1.4.19.bb +++ b/meta/recipes-devtools/m4/m4-native_1.4.20.bb | |||
diff --git a/meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch b/meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch deleted file mode 100644 index 8757abd7a0..0000000000 --- a/meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From b0fd3a58354b1f5ead891907979dfd3dd36840d5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 14 Jan 2023 14:55:03 -0800 | ||
4 | Subject: [PATCH] Define alignof_slot using _Alignof when using C11 or newer | ||
5 | |||
6 | WG14 N2350 made very clear that it is an UB having type definitions | ||
7 | within "offsetof" [1]. This patch enhances the implementation of macro | ||
8 | alignof_slot to use builtin "_Alignof" to avoid undefined behavior on | ||
9 | when using std=c11 or newer | ||
10 | |||
11 | clang 16+ has started to flag this [2] | ||
12 | |||
13 | Fixes build when using -std >= gnu11 and using clang16+ [3] | ||
14 | |||
15 | [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm | ||
16 | [2] https://reviews.llvm.org/D133574 | ||
17 | [3] https://public-inbox.org/bug-gnulib/20230114232744.215167-1-raj.khem@gmail.com/T/#u | ||
18 | |||
19 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d404c7dd974cc65f894526f4a1b76bc1dcd8d82] | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | --- | ||
22 | lib/alignof.h | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | --- a/lib/alignof.h | ||
26 | +++ b/lib/alignof.h | ||
27 | @@ -18,19 +18,19 @@ | ||
28 | #define _ALIGNOF_H | ||
29 | |||
30 | #include <stddef.h> | ||
31 | +#include "stdalign.h" | ||
32 | |||
33 | /* alignof_slot (TYPE) | ||
34 | Determine the alignment of a structure slot (field) of a given type, | ||
35 | at compile time. Note that the result depends on the ABI. | ||
36 | - This is the same as alignof (TYPE) and _Alignof (TYPE), defined in | ||
37 | - <stdalign.h> if __alignof_is_defined is 1. | ||
38 | + This is the same as alignof (TYPE). | ||
39 | Note: The result cannot be used as a value for an 'enum' constant, | ||
40 | due to bugs in HP-UX 10.20 cc and AIX 3.2.5 xlc. */ | ||
41 | #if defined __cplusplus | ||
42 | template <class type> struct alignof_helper { char __slot1; type __slot2; }; | ||
43 | # define alignof_slot(type) offsetof (alignof_helper<type>, __slot2) | ||
44 | #else | ||
45 | -# define alignof_slot(type) offsetof (struct { char __slot1; type __slot2; }, __slot2) | ||
46 | +# define alignof_slot(type) alignof (type) | ||
47 | #endif | ||
48 | |||
49 | /* alignof_type (TYPE) | ||
diff --git a/meta/recipes-devtools/m4/m4/0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch b/meta/recipes-devtools/m4/m4/0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch new file mode 100644 index 0000000000..6fad05041f --- /dev/null +++ b/meta/recipes-devtools/m4/m4/0001-gettext-h-Avoid-gcc-Wformat-security-warnings-with-d.patch | |||
@@ -0,0 +1,133 @@ | |||
1 | From c4dc0ab4424fca31635b7837b1c180f7d3df8ede Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruno Haible <bruno@clisp.org> | ||
3 | Date: Wed, 28 May 2025 15:14:07 +0200 | ||
4 | Subject: [PATCH] gettext-h: Avoid gcc -Wformat-security warnings with | ||
5 | --disable-nls. | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Reported by Holger Hoffstätte <holger@applied-asynchrony.com> in | ||
11 | <https://lists.gnu.org/archive/html/bug-gnulib/2025-05/msg00225.html>. | ||
12 | |||
13 | * lib/gettext.h (gettext, dgettext, dcgettext): With gcc in C mode, | ||
14 | define these as inline functions. | ||
15 | * lib/sigpipe-die.c (sigpipe_die): Use translated string as a format | ||
16 | string, relying on the format string checking done by 'msgfmt -c'. | ||
17 | * lib/xmemcoll.c (collate_error): Revert commit from 2025-01-17. | ||
18 | * lib/xprintf.c (xvprintf, xvfprintf): Likewise. | ||
19 | * lib/openat-die.c (openat_save_fail, openat_restore_fail): Revert | ||
20 | commit from 2024-12-10. | ||
21 | |||
22 | Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/gnulib.git/commit/?id=6e5015dd557b20ae4a0829c4bf78480ce2f4cb04] | ||
23 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
24 | --- | ||
25 | lib/gettext.h | 49 ++++++++++++++++++++++++++++++++++++------------ | ||
26 | lib/openat-die.c | 4 ++-- | ||
27 | lib/xprintf.c | 4 ++-- | ||
28 | 3 files changed, 41 insertions(+), 16 deletions(-) | ||
29 | |||
30 | diff --git a/lib/gettext.h b/lib/gettext.h | ||
31 | index ea0c27e..bb3d975 100644 | ||
32 | --- a/lib/gettext.h | ||
33 | +++ b/lib/gettext.h | ||
34 | @@ -59,18 +59,43 @@ | ||
35 | # endif | ||
36 | # endif | ||
37 | |||
38 | -/* Disabled NLS. | ||
39 | - The casts to 'const char *' serve the purpose of producing warnings | ||
40 | - for invalid uses of the value returned from these functions. | ||
41 | - On pre-ANSI systems without 'const', the config.h file is supposed to | ||
42 | - contain "#define const". */ | ||
43 | -# undef gettext | ||
44 | -# define gettext(Msgid) ((const char *) (Msgid)) | ||
45 | -# undef dgettext | ||
46 | -# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) | ||
47 | -# undef dcgettext | ||
48 | -# define dcgettext(Domainname, Msgid, Category) \ | ||
49 | - ((void) (Category), dgettext (Domainname, Msgid)) | ||
50 | +/* Disabled NLS. */ | ||
51 | +# if defined __GNUC__ && !defined __clang__ && !defined __cplusplus | ||
52 | +/* Use inline functions, to avoid warnings | ||
53 | + warning: format not a string literal and no format arguments | ||
54 | + that don't occur with enabled NLS. */ | ||
55 | +__attribute__ ((__always_inline__, __gnu_inline__)) extern inline | ||
56 | +const char * | ||
57 | +gettext (const char *msgid) | ||
58 | +{ | ||
59 | + return msgid; | ||
60 | +} | ||
61 | +__attribute__ ((__always_inline__, __gnu_inline__)) extern inline | ||
62 | +const char * | ||
63 | +dgettext (const char *domain, const char *msgid) | ||
64 | +{ | ||
65 | + (void) domain; | ||
66 | + return msgid; | ||
67 | +} | ||
68 | +__attribute__ ((__always_inline__, __gnu_inline__)) extern inline | ||
69 | +const char * | ||
70 | +dcgettext (const char *domain, const char *msgid, int category) | ||
71 | +{ | ||
72 | + (void) domain; | ||
73 | + (void) category; | ||
74 | + return msgid; | ||
75 | +} | ||
76 | +# else | ||
77 | +/* The casts to 'const char *' serve the purpose of producing warnings | ||
78 | + for invalid uses of the value returned from these functions. */ | ||
79 | +# undef gettext | ||
80 | +# define gettext(Msgid) ((const char *) (Msgid)) | ||
81 | +# undef dgettext | ||
82 | +# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) | ||
83 | +# undef dcgettext | ||
84 | +# define dcgettext(Domainname, Msgid, Category) \ | ||
85 | + ((void) (Category), dgettext (Domainname, Msgid)) | ||
86 | +# endif | ||
87 | # undef ngettext | ||
88 | # define ngettext(Msgid1, Msgid2, N) \ | ||
89 | ((N) == 1 \ | ||
90 | diff --git a/lib/openat-die.c b/lib/openat-die.c | ||
91 | index 3fbb5d8..79a5b23 100644 | ||
92 | --- a/lib/openat-die.c | ||
93 | +++ b/lib/openat-die.c | ||
94 | @@ -34,7 +34,7 @@ _Noreturn void | ||
95 | openat_save_fail (int errnum) | ||
96 | { | ||
97 | #ifndef GNULIB_LIBPOSIX | ||
98 | - error (exit_failure, errnum, "%s", | ||
99 | + error (exit_failure, errnum, | ||
100 | _("unable to record current working directory")); | ||
101 | #endif | ||
102 | /* _Noreturn cannot be applied to error, since it returns | ||
103 | @@ -53,7 +53,7 @@ _Noreturn void | ||
104 | openat_restore_fail (int errnum) | ||
105 | { | ||
106 | #ifndef GNULIB_LIBPOSIX | ||
107 | - error (exit_failure, errnum, "%s", | ||
108 | + error (exit_failure, errnum, | ||
109 | _("failed to return to initial working directory")); | ||
110 | #endif | ||
111 | |||
112 | diff --git a/lib/xprintf.c b/lib/xprintf.c | ||
113 | index 4d9a3e5..790af53 100644 | ||
114 | --- a/lib/xprintf.c | ||
115 | +++ b/lib/xprintf.c | ||
116 | @@ -45,7 +45,7 @@ xvprintf (char const *restrict format, va_list args) | ||
117 | { | ||
118 | off64_t retval = vzprintf (format, args); | ||
119 | if (retval < 0 && ! ferror (stdout)) | ||
120 | - error (exit_failure, errno, "%s", _("cannot perform formatted output")); | ||
121 | + error (exit_failure, errno, _("cannot perform formatted output")); | ||
122 | |||
123 | return retval; | ||
124 | } | ||
125 | @@ -67,7 +67,7 @@ xvfprintf (FILE *restrict stream, char const *restrict format, va_list args) | ||
126 | { | ||
127 | off64_t retval = vfzprintf (stream, format, args); | ||
128 | if (retval < 0 && ! ferror (stream)) | ||
129 | - error (exit_failure, errno, "%s", _("cannot perform formatted output")); | ||
130 | + error (exit_failure, errno, _("cannot perform formatted output")); | ||
131 | |||
132 | return retval; | ||
133 | } | ||
diff --git a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch b/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch deleted file mode 100644 index 04320de63a..0000000000 --- a/meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 9 Mar 2022 20:22:20 -0800 | ||
4 | Subject: [PATCH] sigsegv: Fix build on ppc/musl | ||
5 | |||
6 | mcontext is not a standard layout so glibc and musl differ sadly. | ||
7 | |||
8 | Fixes | ||
9 | ../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler': ../../m4-1.4.19/lib/sigsegv.c:223:75: error: 'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? 223 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ^~~~~~~ | ||
10 | |||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/m4-patches/2022-03/msg00000.html] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | lib/sigsegv.c | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/lib/sigsegv.c b/lib/sigsegv.c | ||
18 | index 696a152..fa0c465 100644 | ||
19 | --- a/lib/sigsegv.c | ||
20 | +++ b/lib/sigsegv.c | ||
21 | @@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; | ||
22 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] | ||
23 | # else /* 32-bit */ | ||
24 | /* both should be equivalent */ | ||
25 | -# if 0 | ||
26 | -# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] | ||
27 | +# if ! defined __GLIBC__ | ||
28 | +# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] | ||
29 | # else | ||
30 | -# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ||
31 | +# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ||
32 | # endif | ||
33 | # endif | ||
34 | |||
35 | -- | ||
36 | 2.35.1 | ||
37 | |||
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch deleted file mode 100644 index 39fcd91896..0000000000 --- a/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | This patch fixes a build problem for m4-native experienced on Ubuntu 9.10, | ||
4 | where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a | ||
5 | symlink to itself. | ||
6 | |||
7 | The patch comments out ac_config_links directly in configure, | ||
8 | as autoreconf is not actually run for m4-native. | ||
9 | |||
10 | I believe it should be safe, as GNUmakefile is actually unpacked from | ||
11 | source, and what we want is to is to not touch it. | ||
12 | |||
13 | Tested on x86_64_linux (Ubuntu 8.04 and 9.10). | ||
14 | |||
15 | 2009-11-10 Esben Haabendal <eha@doredevelopment.dk> | ||
16 | --- | ||
17 | configure | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure b/configure | ||
21 | index 883336a..6343a34 100755 | ||
22 | --- a/configure | ||
23 | +++ b/configure | ||
24 | @@ -37061,8 +37061,8 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h | ||
25 | # only, it does not matter if we skip the link with older autoconf. | ||
26 | # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH | ||
27 | # builds, so use a shell variable to bypass this. | ||
28 | - GNUmakefile=GNUmakefile | ||
29 | - ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" | ||
30 | +# GNUmakefile=GNUmakefile | ||
31 | +# ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" | ||
32 | |||
33 | |||
34 | LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" | ||
35 | -- | ||
36 | 2.25.1 | ||
37 | |||
diff --git a/meta/recipes-devtools/m4/m4/run-ptest b/meta/recipes-devtools/m4/m4/run-ptest index 5c0fe93357..da786e26f4 100644 --- a/meta/recipes-devtools/m4/m4/run-ptest +++ b/meta/recipes-devtools/m4/m4/run-ptest | |||
@@ -2,4 +2,4 @@ | |||
2 | # | 2 | # |
3 | #This script is used to run m4 test suites | 3 | #This script is used to run m4 test suites |
4 | cd tests | 4 | cd tests |
5 | make -k runtest-TESTS top_srcdir=.. srcdir=. | 5 | make -k runtest-TESTS abs_aux_dir=./build-aux abs_top_srcdir=. abs_srcdir=. 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 index 34e6ad801e..c1573b13c0 100644 --- a/meta/recipes-devtools/m4/m4/serial-tests-config.patch +++ b/meta/recipes-devtools/m4/m4/serial-tests-config.patch | |||
@@ -12,19 +12,14 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
12 | configure.ac | 2 +- | 12 | configure.ac | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 78b8788..931fa6f 100644 | ||
17 | --- a/configure.ac | 15 | --- a/configure.ac |
18 | +++ b/configure.ac | 16 | +++ b/configure.ac |
19 | @@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]), | 17 | @@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/ |
20 | [bug-m4@gnu.org]) | 18 | [bug-m4@gnu.org]) |
21 | AC_CONFIG_AUX_DIR([build-aux]) | 19 | AC_CONFIG_AUX_DIR([build-aux]) |
22 | 20 | ||
23 | -AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests | 21 | -AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz color-tests parallel-tests |
24 | +AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests serial-tests | 22 | +AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz color-tests serial-tests |
25 | silent-rules subdir-objects gnu]) | 23 | silent-rules subdir-objects gnu]) |
26 | AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. | 24 | AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. |
27 | 25 | ||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||
diff --git a/meta/recipes-devtools/m4/m4_1.4.19.bb b/meta/recipes-devtools/m4/m4_1.4.20.bb index b12c0adf3a..b12c0adf3a 100644 --- a/meta/recipes-devtools/m4/m4_1.4.19.bb +++ b/meta/recipes-devtools/m4/m4_1.4.20.bb | |||