Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/files/
Date: Wed, 31 Mar 2021 19:51:55
Message-Id: 1617220251.f1793aa6cc9fb435bdbea14069b72356f211032c.conikost@gentoo
1 commit: f1793aa6cc9fb435bdbea14069b72356f211032c
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Mar 29 18:03:16 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 19:50:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1793aa6
7
8 sys-devel/m4: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/20184
11 Package-Manager: Portage-3.0.17, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 sys-devel/m4/files/m4-1.4.17-posix_spawn.patch | 111 -------------------------
16 1 file changed, 111 deletions(-)
17
18 diff --git a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch b/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
19 deleted file mode 100644
20 index 5954cc35d54..00000000000
21 --- a/sys-devel/m4/files/m4-1.4.17-posix_spawn.patch
22 +++ /dev/null
23 @@ -1,111 +0,0 @@
24 -This fixes the search for posix_spawn() to use AC_SEARCH_LIBS which
25 -is needed for uClibc which puts the function in librt [1]. The fix
26 -is in gnulib commit d6eab2e [2], but we can't just apply that patch
27 -and autoreconf because that means we must depend on autotools.eclass
28 -and this leads to a circular dependency. So we have to patch
29 -configure directlly.
30 -
31 -[1] https://bugs.gentoo.org/show_bug.cgi?id=580688
32 -[2] http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5
33 -[3] https://bugs.gentoo.org/show_bug.cgi?id=581086
34 -
35 -Signed-off-by: Anthony G. Basile <blueness@g.o>
36 -
37 -diff -Naur m4-1.4.17.orig/configure m4-1.4.17/configure
38 ---- m4-1.4.17.orig/configure 2013-09-22 06:38:28.000000000 +0000
39 -+++ m4-1.4.17/configure 2016-04-25 22:27:12.774118561 +0000
40 -@@ -808,6 +808,7 @@
41 - GNULIB_SIGNAL_H_SIGPIPE
42 - GNULIB_RAISE
43 - GNULIB_PTHREAD_SIGMASK
44 -+LIB_POSIX_SPAWN
45 - REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
46 - REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
47 - REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
48 -@@ -3590,7 +3591,6 @@
49 - as_fn_append ac_func_list " mkstemp"
50 - as_fn_append ac_func_list " nl_langinfo"
51 - as_fn_append ac_func_list " pipe2"
52 --as_fn_append ac_func_list " posix_spawn"
53 - gl_printf_safe=yes
54 - as_fn_append ac_func_list " isblank"
55 - as_fn_append ac_func_list " iswctype"
56 -@@ -15877,8 +15881,78 @@
57 -
58 -
59 -
60 -+ LIB_POSIX_SPAWN=
61 -+
62 -+ gl_saved_libs=$LIBS
63 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing posix_spawn" >&5
64 -+$as_echo_n "checking for library containing posix_spawn... " >&6; }
65 -+if ${ac_cv_search_posix_spawn+:} false; then :
66 -+ $as_echo_n "(cached) " >&6
67 -+else
68 -+ ac_func_search_save_LIBS=$LIBS
69 -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
70 -+/* end confdefs.h. */
71 -+
72 -+/* Override any GCC internal prototype to avoid an error.
73 -+ Use char because int might match the return type of a GCC
74 -+ builtin and then its argument prototype would still apply. */
75 -+#ifdef __cplusplus
76 -+extern "C"
77 -+#endif
78 -+char posix_spawn ();
79 -+int
80 -+main ()
81 -+{
82 -+return posix_spawn ();
83 -+ ;
84 -+ return 0;
85 -+}
86 -+_ACEOF
87 -+for ac_lib in '' rt; do
88 -+ if test -z "$ac_lib"; then
89 -+ ac_res="none required"
90 -+ else
91 -+ ac_res=-l$ac_lib
92 -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
93 -+ fi
94 -+ if ac_fn_c_try_link "$LINENO"; then :
95 -+ ac_cv_search_posix_spawn=$ac_res
96 -+fi
97 -+rm -f core conftest.err conftest.$ac_objext \
98 -+ conftest$ac_exeext
99 -+ if ${ac_cv_search_posix_spawn+:} false; then :
100 -+ break
101 -+fi
102 -+done
103 -+if ${ac_cv_search_posix_spawn+:} false; then :
104 -+
105 -+else
106 -+ ac_cv_search_posix_spawn=no
107 -+fi
108 -+rm conftest.$ac_ext
109 -+LIBS=$ac_func_search_save_LIBS
110 -+fi
111 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_posix_spawn" >&5
112 -+$as_echo "$ac_cv_search_posix_spawn" >&6; }
113 -+ac_res=$ac_cv_search_posix_spawn
114 -+if test "$ac_res" != no; then :
115 -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
116 -+ test "$ac_cv_search_posix_spawn" = "none required" ||
117 -+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn
118 -+fi
119 -+
120 -+ for ac_func in posix_spawn
121 -+do :
122 -+ ac_fn_c_check_func "$LINENO" "posix_spawn" "ac_cv_func_posix_spawn"
123 -+if test "x$ac_cv_func_posix_spawn" = xyes; then :
124 -+ cat >>confdefs.h <<_ACEOF
125 -+#define HAVE_POSIX_SPAWN 1
126 -+_ACEOF
127 -
128 -+fi
129 -+done
130 -
131 -+ LIBS=$gl_saved_libs
132 -
133 - if test $ac_cv_func_posix_spawn != yes; then
134 - HAVE_POSIX_SPAWN=0