summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-06-15 10:12:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 00:07:05 +0100
commit3f51d9e627503d6e744dbf327106940d1b3020c0 (patch)
tree4fc9f3c299681f5eb79c53803353c13e4adfa925 /meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
parent3d76fca34b3ff2984b06560faa8399515d19b6e2 (diff)
downloadpoky-3f51d9e627503d6e744dbf327106940d1b3020c0.tar.gz
m4: upgrade 1.4.18 -> 1.4.19
0001-Unset-need_charset_alias-when-building-for-musl.patch 0001-c-stack-stop-using-SIGSTKSZ.patch 0001-test-getopt-posix-fix.patch m4-1.4.18-glibc-change-work-around.patch deleted since they are included in 1.4.19 refresh ac_config_links.patch License-update: URL of license changed (From OE-Core rev: c61358d84d83f0fbd8b2fbe2659ed547e0c046a4) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch')
-rw-r--r--meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch b/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
deleted file mode 100644
index 11508ee0e2..0000000000
--- a/meta/recipes-devtools/m4/m4/0001-test-getopt-posix-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 75bea7c72a919859674f493548653de88f96c798 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 22 Apr 2019 10:36:13 +0800
4Subject: [PATCH] test-getopt-posix fix
5
6fix below problem:
7test-getopt.h:754: assertion 'strcmp (argv[1], "donald") == 0' failed
8
9get this patch from
10https://github.com/habitat-sh/core-plans/blob/master/m4/fix-test-getopt-posix-with-glibc-2.26.patch
11
12Upstream-Status: Pending
13
14have report this bug to m4-discuss@gnu.org
15
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17---
18 tests/test-getopt-posix.c | 7 +++++++
19 1 file changed, 7 insertions(+)
20
21diff --git a/tests/test-getopt-posix.c b/tests/test-getopt-posix.c
22index 5532271..2a3d511 100644
23--- a/tests/test-getopt-posix.c
24+++ b/tests/test-getopt-posix.c
25@@ -22,6 +22,13 @@
26 ftell link warning if we are not using the gnulib ftell module. */
27 #define _GL_NO_LARGE_FILES
28
29+/*
30+ * Glibc 2.26 does hard include bits/getopt_posix.h which causes the system
31+ * to use glibc's getopt but the tests expect gnulib behavior. Until a better
32+ * fix is available this avoids that mis-resolution.
33+ */
34+#include <getopt.h>
35+
36 /* POSIX and glibc provide the getopt() function in <unistd.h>, see
37 http://pubs.opengroup.org/onlinepubs/9699919799/functions/getopt.html
38 https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html
39--
402.7.4
41