Browse files

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)
  • Loading branch information...
1 parent 626297c commit 56631f8f78afd6f46d29e1bdbd5cc0ee7978b9a2 Cyprien Nicolas (fulax) committed Jul 3, 2012
View
17 dev-scheme/guile/Manifest
@@ -4,22 +4,23 @@ Hash: SHA1
AUX 3742d778fbc6ea879437c19aeebe09179dceffdf.patch 1502 RMD160 e0f2b98b28b79189ce13e8fa96f2658312b49ada SHA1 a198b101da27ae9fa77532a8112f5bf1e32bf22a SHA256 24b3cf6cf5706e5207aab8b1d8f61cc8291d66e97bcd403a42497eb4b904338c
AUX 50guile-gentoo.el 74 RMD160 e64895b1e48ca842f32301a2ac68ae099e25844e SHA1 ec3a8ab924b595fc5323eec7c33f938e9d26a911 SHA256 ad625c24e5bb48b001eb4a68d441f10037acf467f5f91f68106c538dbee965b5
AUX guile-1.8.8-fix_guile-config.patch 494 RMD160 61fcb0ac730a44ef93df26bdd5e6e0ce3b1a2dbf SHA1 5e9132af1dd7ae7394851c1266b6a85419abca31 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4
+AUX guile-1.8.8-fix_stack-grow-direction-check.patch 1427 RMD160 85ed25b17d384a921a240ba81d39612ed9e6704e SHA1 33b405d42de23e20fa2a0f08415b76aceda55588 SHA256 1035c3dbecccfceb6e00ae906438b757bcfd8048227dd0f26b629d24a59cbd83
DIST guile-1.8.8.tar.gz 3956654 RMD160 8ac185a72ad8394b14d5377549e5bbf02889faaa SHA1 548d6927aeda332b117f8fc5e4e82c39a05704f9 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
DIST guile-2.0.1.tar.gz 6601636 RMD160 7b498f85221a0560978e836b8bc38eb313836bfc SHA1 3276a826f17a5edc0baf2eedc4821a771824141b SHA256 f1198caca27d9de23e9b1cbaf55cbde1915f8a6ee420e2971a6422f9693638d6
DIST guile-2.0.5.tar.gz 6924159 RMD160 51deb23e2ab26e89e9b97f3937ada1609b0329fd SHA1 0cf94962ab637975bf2ad00afa15638dcc67408f SHA256 2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956
-EBUILD guile-1.8.8-r2.ebuild 3237 RMD160 70499936053783ea0ab506870852c410bc896846 SHA1 1e9e81f3ab6ecf1df4160b376063165a37af9069 SHA256 3eb095ed8f5482208e662e1c000116254879a05b43e23249bf2c65056b0d378a
+EBUILD guile-1.8.8-r2.ebuild 3193 RMD160 750aaf48d12a9310db5ea5fd4fde1e323e499db0 SHA1 236a7028cbe632650f0a4584e6366bf2106f1f2e SHA256 5db286a9577caca4aff7a674078fa5da5a16be3ea66e2e0579b0d711a4d2404b
EBUILD guile-2.0.1.ebuild 2672 RMD160 7ea161b1e7492d39646d8a64fce08751389bf741 SHA1 d185ad71a44b0338d47d6e12199eae8c02cb50db SHA256 81a4285b38f5e7e220beb750af2bff361445077a01a5587a66d7f6f88964c5ab
EBUILD guile-2.0.5.ebuild 2896 RMD160 eb81eeb94efd100bd49e36f9438490c63a3193db SHA1 10b2b178aa45dffff56b982bbbbeae3c1567d7cf SHA256 8618c4556fe9e9c0d125036a707d9e626b3cbfc4882c382c2a9f9bd8e5727dd7
EBUILD guile-999.ebuild 2955 RMD160 c3d48f075ad44ccffadc49d5fdd13ad56b9d3f8b SHA1 62ba7d36f5989864d6037c3eca1d629f99b6e4e9 SHA256 b3b03f216d204a286c1233292d08cf08ec44c7195ad5215cd0119f9ee686f2fe
MISC metadata.xml 1002 RMD160 5f873230234ee982ad825c9ca09d8a9010e08487 SHA1 8f971aa8b60077cfec87acb61540253e08ee7f56 SHA256 60781a2ffcda537e7cf6922542f398e646d219fae385f707f544cf3b27a62688
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJPsY/bAAoJED15R4++Y6lvAhUH/R2cTSW5giX1mXprFGTfJEzN
-kVu5ZUHxnCZO5tbImHiKPFNIxSlywNPb5P3ndX0QpLIvIwUvLnWumHpm9d5a/7Pi
-hfhXnJ9gdt7Igvr5MruSqHqe7BkPPNneQaPEQZljioKEoCEmJQiSTnTQVHsLUEF6
-b5ofXXA4E6kI7ZJbssKcribWmyQvBru1u1yCSwtIycx2dXW351LB208GIXziXtpf
-GQRQwetACvzdbrNlJnfO89Y5807rQB57XabOWnIBgfDd5a77e6RX7SKfjMGZ9FdN
-C2RESXOie1+LdLkVxWdr2bVQ8DQlbV1N+oPl3kLe+66FLiXy5+oVUfItViioqnQ=
-=ku6K
+iQEcBAEBAgAGBQJP82izAAoJED15R4++Y6lv0koIAJy7/DyJu8qyJEfgAt4fjVKW
+J2DF0SfP84dtHoOK7bFihvHps25WpSJYvBInINVDiDPTFsy3jDylbmoIsm4m3VdU
+XruZqLclfCJmuYmr3JhfGFtELY3G/B5qg1CwMz0WF+1+FGI2PhLG3u6uUccpN8Hy
+FpqXB2rkO7zdKmjG7lSKxTUN3w2P0IAvkA09/FYP2pWCTO904pGAtH6cgRwMVZyU
+/vyRhwdDBEtMEQzAE2JUftLYEf0oQTKFrJA+11iLtkX8anlxfpERq/9o46xIwt4e
+TEcFjhzCxZ6qUFLCn3qeWpUecDwdf5y6NyYYAfzcwgNC/bFPGZvYd2CoL1tz7PA=
+=Jn6P
-----END PGP SIGNATURE-----
View
53 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@gnu.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@gmail.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
View
8 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
}

0 comments on commit 56631f8

Please sign in to comment.