diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-02-22 02:47:50 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-02-22 02:47:50 +0000 |
commit | bbc42b36a3d66d10d7cfd6b304ade2eeb8b9bd11 (patch) | |
tree | a347235e3565df21d536cf74421f516db72fd101 /sys-devel/m4 | |
parent | Version bump (diff) | |
download | gentoo-2-bbc42b36a3d66d10d7cfd6b304ade2eeb8b9bd11.tar.gz gentoo-2-bbc42b36a3d66d10d7cfd6b304ade2eeb8b9bd11.tar.bz2 gentoo-2-bbc42b36a3d66d10d7cfd6b304ade2eeb8b9bd11.zip |
old
Diffstat (limited to 'sys-devel/m4')
-rw-r--r-- | sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch | 64 | ||||
-rw-r--r-- | sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch | 36 | ||||
-rw-r--r-- | sys-devel/m4/m4-1.4.12.ebuild | 42 | ||||
-rw-r--r-- | sys-devel/m4/m4-1.4.14-r1.ebuild | 50 |
4 files changed, 0 insertions, 192 deletions
diff --git a/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch b/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch deleted file mode 100644 index 6507a7175dc9..000000000000 --- a/sys-devel/m4/files/m4-1.4.14-glibc-2.12.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://bugs.gentoo.org/332839 - -From 1359a849055a66eddffe7753485e0f29fb85ef31 Mon Sep 17 00:00:00 2001 -From: Eric Blake <eblake@redhat.com> -Date: Fri, 4 Jun 2010 06:07:38 -0600 -Subject: [PATCH] Fix build on newer glibc. - -POSIX allows, but does not require, that <fcntl.h> implicitly -includes <sys/stat.h>. Until recent glibc, most systems did -this implicit inclusion, and m4 was mistakenly relying on it. - -* src/m4.h (includes): Add <sys/stat.h>. -* THANKS: Update. -Reported by Todd Rinaldo. - -Signed-off-by: Eric Blake <eblake@redhat.com> ---- - ChangeLog | 7 +++++++ - THANKS | 2 ++ - src/m4.h | 1 + - 3 files changed, 10 insertions(+), 0 deletions(-) - -2010-06-04 Eric Blake <eblake@redhat.com> - - Fix build on newer glibc. - * src/m4.h (includes): Add <sys/stat.h>. - * THANKS: Update. - Reported by Todd Rinaldo. - -diff --git a/THANKS b/THANKS -index f43e2aa..6f49e78 100644 ---- a/THANKS -+++ b/THANKS -@@ -43,6 +43,7 @@ Frank Schwidom schwidom@impernet.de - Gary V. Vaughan gary@gnu.org - Geoff Russell grussell@guest.adelaide.edu.au - Giovanni Toffetti toffettg@lu.unisi.ch -+Giuseppe Scrivano gscrivano@gnu.org - Greg A. Woods woods@web.apc.org - Hal Peterson hrp@pecan.cray.com - Hoang Uong hoang@ornews.intel.com -@@ -114,6 +115,7 @@ Steve Williamson willy@uinpla.npl.uiuc.edu - Steven Augart saugart@yahoo.com - Thomas Klausner tk@giga.or.at - Thorsten Ohl ohl@physics.harvard.edu -+Todd Rinaldo toddr@cpanel.net - Tom G. Christensen tgc@jupiterrise.com - Tom McConnell tmcconne@sedona.intel.com - Tom Quinn trq@dionysos.thphys.ox.ac.uk -diff --git a/src/m4.h b/src/m4.h -index ccd9936..70dc7a8 100644 ---- a/src/m4.h -+++ b/src/m4.h -@@ -32,6 +32,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <string.h> -+#include <sys/stat.h> - #include <sys/types.h> - - #include "binary-io.h" --- -1.7.2 - diff --git a/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch b/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch deleted file mode 100644 index ec233328584e..000000000000 --- a/sys-devel/m4/files/m4-1.4.14-gnulib_spawn.patch +++ /dev/null @@ -1,36 +0,0 @@ -Don't override the system defined values on FreeBSD 8. -See Gentoo bug #310335. -Patch from upstream gnulib: -http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=88baa1ed437db0f062e49b87cff59002ec8f7ab2 - ---- m4-1.4.14/lib/spawn.in.h.orig -+++ m4-1.4.14/lib/spawn.in.h -@@ -110,17 +110,19 @@ - - - /* Flags to be set in the `posix_spawnattr_t'. */ --#if @REPLACE_POSIX_SPAWN@ -+#if !@HAVE_POSIX_SPAWN@ -+# if @REPLACE_POSIX_SPAWN@ - /* Use the values from the system, for better compatibility. */ - /* But this implementation does not support AIX extensions. */ --# undef POSIX_SPAWN_FORK_HANDLERS --#else --# define POSIX_SPAWN_RESETIDS 0x01 --# define POSIX_SPAWN_SETPGROUP 0x02 --# define POSIX_SPAWN_SETSIGDEF 0x04 --# define POSIX_SPAWN_SETSIGMASK 0x08 --# define POSIX_SPAWN_SETSCHEDPARAM 0x10 --# define POSIX_SPAWN_SETSCHEDULER 0x20 -+# undef POSIX_SPAWN_FORK_HANDLERS -+# else -+# define POSIX_SPAWN_RESETIDS 0x01 -+# define POSIX_SPAWN_SETPGROUP 0x02 -+# define POSIX_SPAWN_SETSIGDEF 0x04 -+# define POSIX_SPAWN_SETSIGMASK 0x08 -+# define POSIX_SPAWN_SETSCHEDPARAM 0x10 -+# define POSIX_SPAWN_SETSCHEDULER 0x20 -+# endif - #endif - /* A GNU extension. Use the next free bit position. */ - #define POSIX_SPAWN_USEVFORK \ diff --git a/sys-devel/m4/m4-1.4.12.ebuild b/sys-devel/m4/m4-1.4.12.ebuild deleted file mode 100644 index a8e0455a2138..000000000000 --- a/sys-devel/m4/m4-1.4.12.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.12.ebuild,v 1.11 2009/09/08 17:49:43 vapier Exp $ - -DESCRIPTION="GNU macro processor" -HOMEPAGE="http://www.gnu.org/software/m4/m4.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.lzma" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="examples" - -# remember: cannot dep on autoconf since it needs us -DEPEND="|| ( app-arch/xz-utils app-arch/lzma-utils )" -RDEPEND="" - -src_compile() { - local myconf="" - [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" - econf \ - --enable-changeword \ - ${myconf} \ - || die - emake || die -} - -src_test() { - [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 - emake check || die -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc BACKLOG ChangeLog NEWS README* THANKS TODO - if use examples ; then - docinto examples - dodoc examples/* - rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile* - fi - rm -f "${D}"/usr/lib/charset.alias #172864 -} diff --git a/sys-devel/m4/m4-1.4.14-r1.ebuild b/sys-devel/m4/m4-1.4.14-r1.ebuild deleted file mode 100644 index efd577a6510f..000000000000 --- a/sys-devel/m4/m4-1.4.14-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.14-r1.ebuild,v 1.9 2010/09/06 20:26:45 ranger Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="GNU macro processor" -HOMEPAGE="http://www.gnu.org/software/m4/m4.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="examples" - -# remember: cannot dep on autoconf since it needs us -DEPEND="app-arch/xz-utils" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gnulib_spawn.patch #310335 - epatch "${FILESDIR}"/${P}-glibc-2.12.patch #332839 -} - -src_configure() { - # Disable automagic dependency over libsigsegv; see bug #278026 - export ac_cv_libsigsegv=no - - local myconf="" - [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" - econf --enable-changeword ${myconf} -} - -src_test() { - [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 - emake check || die -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc BACKLOG ChangeLog NEWS README* THANKS TODO - if use examples ; then - docinto examples - dodoc examples/* - rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile* - fi - rm -f "${D}"/usr/lib/charset.alias #172864 -} |