[gentoo-commits] proj/lisp:master commit in: dev-scheme/guile/files/, dev-scheme/guile/

[Cyprien Nicolas]

commit:     56631f8f78afd6f46d29e1bdbd5cc0ee7978b9a2
Author:     Cyprien Nicolas (fulax) <c.nicolas+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jul  3 21:48:35 2012 +0000
Commit:     Cyprien Nicolas <c.nicolas+gentoo <AT> gmail <DOT> com>
CommitDate: Tue Jul  3 21:48:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=56631f8f

dev-scheme/guile-1.8.8-r2: Import upstream patch for bug #424475. No revbump as it fixes a build-time failure.

(Portage version: 2.2.0_alpha110/git/Linux i686, signed Manifest commit with key 0xBE63A96F)

---
 ...uile-1.8.8-fix_stack-grow-direction-check.patch |   53 ++++++++++++++++++++
 dev-scheme/guile/guile-1.8.8-r2.ebuild             |    8 ++--
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch b/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch
new file mode 100644
index 0000000..a9fe226
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-fix_stack-grow-direction-check.patch
@@ -0,0 +1,53 @@
+From 62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94 Mon Sep 17 00:00:00 2001
+From: Ludovic Courtès <ludo@×××.org>
+Date: Sun, 01 Jul 2012 15:32:03 +0000
+Subject: Fix stack growth direction check.
+
+Backport of 236f901b0e2b18093421e2e440cf80d00fb98757 from `stable-2.0'.
+Fixes <http://bugs.gnu.org/11845>.
+Reported by Cyprien Nicolas <c.nicolas@×××××.com>.
+
+* configure.in: Pull stack growth direction check from upstream
+  Autoconf.  See
+  http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00035.html
+  for a discussion.
+---
+diff --git a/configure.in b/configure.in
+index f058841..682e31f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1244,23 +1244,20 @@ SCM_I_GSC_STACK_GROWS_UP=0
+ AC_RUN_IFELSE([AC_LANG_SOURCE(
+ [AC_INCLUDES_DEFAULT
+ int
+-find_stack_direction ()
++find_stack_direction (int *addr, int depth)
+ {
+-  static char *addr = 0;
+-  auto char dummy;
+-  if (addr == 0)
+-    {
+-      addr = &dummy;
+-      return find_stack_direction ();
+-    }
+-  else
+-    return (&dummy > addr) ? 1 : -1;
++  int dir, dummy = 0;
++  if (! addr)
++    addr = &dummy;
++  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
++  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
++  return dir + dummy;
+ }
+ 
+ int
+-main ()
++main (int argc, char **argv)
+ {
+-  return find_stack_direction () < 0;
++  return find_stack_direction (0, argc + !argv + 20) < 0;
+ }])],
+ 	       [SCM_I_GSC_STACK_GROWS_UP=1],
+ 	       [],
+--
+cgit v0.9.0.2

diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index ffac522..82fce01 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.10 2011/07/09 11:18:15 xarthisius Exp $
+# $Header: $
 
-EAPI=3
+EAPI=4
 inherit eutils autotools flag-o-matic elisp-common
 
 DESCRIPTION="Scheme interpreter"
@@ -29,8 +29,8 @@ SLOT="12"
 MAJOR="1.8"
 
 src_prepare() {
-	#
 	epatch "${FILESDIR}/${P}-fix_guile-config.patch"
+	epatch "${FILESDIR}/${P}-fix_stack-grow-direction-check.patch"
 	eautoreconf
 }