summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-04-25 17:53:51 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-04-25 18:57:36 -0400
commit4cd636ae6940f204fdffdad8954f5043cf93a204 (patch)
tree9cec8d3acbf89934d493368e7b31b0996ec81632 /sys-devel/m4
parentRevert "sys-devel/m4: add autoreconf needed with d2fb79b" (diff)
downloadgentoo-4cd636ae6940f204fdffdad8954f5043cf93a204.tar.gz
gentoo-4cd636ae6940f204fdffdad8954f5043cf93a204.tar.bz2
gentoo-4cd636ae6940f204fdffdad8954f5043cf93a204.zip
Revert "sys-devel/m4: fix spawn_h.m4 for uclibc, bug #580688"
This reverts commit d2fb79b419c1da51746a75a5f55e8b10a7993673.
Diffstat (limited to 'sys-devel/m4')
-rw-r--r--sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch31
-rw-r--r--sys-devel/m4/m4-1.4.17.ebuild8
2 files changed, 2 insertions, 37 deletions
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
deleted file mode 100644
index dbbac65466c..00000000000
--- a/sys-devel/m4/files/m4-1.4.17-fix-spawn_h_m4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit d6eab2e70fc5ccc82a73e5c988b76a229e4cd3d5
-Author: Pádraig Brady <P@draigBrady.com>
-Date: Tue Jan 14 16:59:07 2014 +0000
-
- spawn: fix link error on uclibc
-
- * m4/spawn_h.m4 (gl_HAVE_POSIX_SPAWN): use AC_SEARCH_LIBS,
- to incorporate -lrt if needed (on uclibc for example).
- * modules/posix_spawn: Reference the substituted LIB.
-
-diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
-index 87fe122..3eb835c 100644
---- a/m4/spawn_h.m4
-+++ b/m4/spawn_h.m4
-@@ -64,7 +64,15 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
- dnl once only, before all statements that occur in other macros.
- AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-
-- AC_CHECK_FUNCS_ONCE([posix_spawn])
-+ LIB_POSIX_SPAWN=
-+ AC_SUBST([LIB_POSIX_SPAWN])
-+ gl_saved_libs=$LIBS
-+ AC_SEARCH_LIBS([posix_spawn], [rt],
-+ [test "$ac_cv_search_posix_spawn" = "none required" ||
-+ LIB_POSIX_SPAWN=$ac_cv_search_posix_spawn])
-+ AC_CHECK_FUNCS([posix_spawn])
-+ LIBS=$gl_saved_libs
-+
- if test $ac_cv_func_posix_spawn != yes; then
- HAVE_POSIX_SPAWN=0
- fi
diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
index b28aa180460..3e45c8c98c1 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
-
-inherit eutils
+EAPI="4"
DESCRIPTION="GNU macro processor"
HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
@@ -20,8 +18,6 @@ DEPEND="app-arch/xz-utils"
RDEPEND=""
src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-spawn_h_m4.patch #580688
-
# Disable gnulib build test that has no impact on the source.
# Re-enable w/next version bump (and gnulib is updated). #554728
[[ ${PV} != "1.4.17" ]] && die "re-enable test #554728"