diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-12-14 19:30:22 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-12-14 19:30:22 +0000 |
| commit | b72cdb4a178aae584a8bb92ce037a97e1637cc67 (patch) | |
| tree | 3e8fd2a9416bde2201ce10910827637ee597b0d1 /dev-scheme/guile | |
| parent | alpha/ia64/sparc stable wrt #288026 (diff) | |
| download | gentoo-2-b72cdb4a178aae584a8bb92ce037a97e1637cc67.tar.gz gentoo-2-b72cdb4a178aae584a8bb92ce037a97e1637cc67.tar.bz2 gentoo-2-b72cdb4a178aae584a8bb92ce037a97e1637cc67.zip | |
Fix test failure, bug 295093.
(Portage version: 2.2_rc59/cvs/Linux i686)
Diffstat (limited to 'dev-scheme/guile')
| -rw-r--r-- | dev-scheme/guile/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-scheme/guile/files/guile-1.8.7-fix_tests.patch | 34 | ||||
| -rw-r--r-- | dev-scheme/guile/guile-1.8.7.ebuild | 7 |
3 files changed, 43 insertions, 4 deletions
diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog index bbd4c861f188..6cc28039b0bc 100644 --- a/dev-scheme/guile/ChangeLog +++ b/dev-scheme/guile/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-scheme/guile # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.74 2009/12/05 14:23:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.75 2009/12/14 19:30:22 ulm Exp $ + + 14 Dec 2009; Ulrich Mueller <ulm@gentoo.org> guile-1.8.7.ebuild, + +files/guile-1.8.7-fix_tests.patch: + Fix test failure, bug 295093. Proxy commit for Tomás Touceda (chiiph). *guile-1.8.7 (05 Dec 2009) diff --git a/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch b/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch new file mode 100644 index 000000000000..dc67f3acb7d7 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch @@ -0,0 +1,34 @@ +http://bugs.gentoo.org/295093 + +--- guile-1.8.7.orig/test-suite/standalone/Makefile.am ++++ guile-1.8.7/test-suite/standalone/Makefile.am +@@ -28,7 +28,9 @@ + BUILT_SOURCES = + EXTRA_DIST = + +-TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env" ++TESTS_ENVIRONMENT = \ ++builddir="$(builddir)" \ ++GUILE_AUTO_COMPILE=0 "${top_builddir}/pre-inst-guile-env" + + test_cflags = \ + -I$(top_srcdir)/test-suite/standalone \ +--- guile-1.8.7.orig/test-suite/standalone/test-asmobs ++++ guile-1.8.7/test-suite/standalone/test-asmobs +@@ -2,7 +2,8 @@ + exec guile -q -s "$0" "$@" + !# + +-(load-extension "libtest-asmobs" "libtest_asmobs_init") ++(load-extension (string-append (getenv "builddir") "/libtest-asmobs") ++ "libtest_asmobs_init") + + (define (test x v) + (if v +@@ -114,4 +115,4 @@ + + ;; Local Variables: + ;; mode: scheme +-;; End: +\ No newline at end of file ++;; End: diff --git a/dev-scheme/guile/guile-1.8.7.ebuild b/dev-scheme/guile/guile-1.8.7.ebuild index 3ab31eb55de6..cd4e9e0e3db3 100644 --- a/dev-scheme/guile/guile-1.8.7.ebuild +++ b/dev-scheme/guile/guile-1.8.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.1 2009/12/05 14:23:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.2 2009/12/14 19:30:22 ulm Exp $ EAPI=1 -inherit flag-o-matic elisp-common +inherit eutils autotools flag-o-matic elisp-common DESCRIPTION="Scheme interpreter" HOMEPAGE="http://www.gnu.org/software/guile/" @@ -29,6 +29,7 @@ src_unpack() { unpack ${A}; cd "${S}" sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test + epatch "${FILESDIR}/${P}-fix_tests.patch" # cp configure.in configure.in.old @@ -37,7 +38,7 @@ src_unpack() { # diff -u configure.in.old configure.in -# eautoreconf + eautoreconf } src_compile() { |