| 1 |
commit: 4cd636ae6940f204fdffdad8954f5043cf93a204 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 25 21:53:51 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 25 22:57:36 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd636ae |
| 7 |
|
| 8 |
Revert "sys-devel/m4: fix spawn_h.m4 for uclibc, bug #580688" |
| 9 |
|
| 10 |
This reverts commit d2fb79b419c1da51746a75a5f55e8b10a7993673. |
| 11 |
|
| 12 |
sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch | 31 ----------------------- |
| 13 |
sys-devel/m4/m4-1.4.17.ebuild | 8 ++---- |
| 14 |
2 files changed, 2 insertions(+), 37 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch b/sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index dbbac65..0000000 |
| 19 |
--- a/sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,31 +0,0 @@ |
| 22 |
-commit d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5 |
| 23 |
-Author: Pádraig Brady <P@××××××××××.com> |
| 24 |
-Date: Tue Jan 14 16:59:07 2014 +0000 |
| 25 |
- |
| 26 |
- spawn: fix link error on uclibc |
| 27 |
- |
| 28 |
- * m4/spawn_h.m4 (gl_HAVE_POSIX_SPAWN): use AC_SEARCH_LIBS, |
| 29 |
- to incorporate -lrt if needed (on uclibc for example). |
| 30 |
- * modules/posix_spawn: Reference the substituted LIB. |
| 31 |
- |
| 32 |
-diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 |
| 33 |
-index 87fe122..3eb835c 100644 |
| 34 |
---- a/m4/spawn_h.m4 |
| 35 |
-+++ b/m4/spawn_h.m4 |
| 36 |
-@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN], |
| 37 |
- dnl once only, before all statements that occur in other macros. |
| 38 |
- AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) |
| 39 |
- |
| 40 |
-- AC_CHECK_FUNCS_ONCE([posix_spawn]) |
| 41 |
-+ LIB_POSIX_SPAWN= |
| 42 |
-+ AC_SUBST([LIB_POSIX_SPAWN]) |
| 43 |
-+ gl_saved_libs=$LIBS |
| 44 |
-+ AC_SEARCH_LIBS([posix_spawn], [rt], |
| 45 |
-+ [test "$ac_cv_search_posix_spawn" = "none required" || |
| 46 |
-+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn]) |
| 47 |
-+ AC_CHECK_FUNCS([posix_spawn]) |
| 48 |
-+ LIBS=$gl_saved_libs |
| 49 |
-+ |
| 50 |
- if test $ac_cv_func_posix_spawn != yes; then |
| 51 |
- HAVE_POSIX_SPAWN=0 |
| 52 |
- fi |
| 53 |
|
| 54 |
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild |
| 55 |
index b28aa18..3e45c8c 100644 |
| 56 |
--- a/sys-devel/m4/m4-1.4.17.ebuild |
| 57 |
+++ b/sys-devel/m4/m4-1.4.17.ebuild |
| 58 |
@@ -1,10 +1,8 @@ |
| 59 |
-# Copyright 1999-2016 Gentoo Foundation |
| 60 |
+# Copyright 1999-2015 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
# $Id$ |
| 63 |
|
| 64 |
-EAPI="5" |
| 65 |
- |
| 66 |
-inherit eutils |
| 67 |
+EAPI="4" |
| 68 |
|
| 69 |
DESCRIPTION="GNU macro processor" |
| 70 |
HOMEPAGE="https://www.gnu.org/software/m4/m4.html" |
| 71 |
@@ -20,8 +18,6 @@ DEPEND="app-arch/xz-utils" |
| 72 |
RDEPEND="" |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
- epatch "${FILESDIR}"/${P}-fix-spawn_h_m4.patch #580688 |
| 76 |
- |
| 77 |
# Disable gnulib build test that has no impact on the source. |
| 78 |
# Re-enable w/next version bump (and gnulib is updated). #554728 |
| 79 |
[[ ${PV} != "1.4.17" ]] && die "re-enable test #554728" |
Archives