From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Apr 2011 23:38:21 +0000 (+0200)
Subject: guile: Update to 1.8.8.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8316917390b96d5f357617d79e1acf4cbce161a2;p=ipfire-3.x.git

guile: Update to 1.8.8.
---

diff --git a/pkgs/guile/guile.nm b/pkgs/guile/guile.nm
index 26f5359b7..01e8aaf3f 100644
--- a/pkgs/guile/guile.nm
+++ b/pkgs/guile/guile.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = guile
-PKG_VER        = 1.8.7
+PKG_VER        = 1.8.8
 PKG_REL        = 1
 
 PKG_MAINTAINER =
@@ -47,6 +47,10 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 
 PKG_PACKAGES  += $(PKG_NAME)-devel
 
+CONFIGURE_OPTIONS += \
+	--disable-static \
+	--disable-error-on-warning
+
 QUALITY_AGENT_WHITELIST_RPATH = /usr/lib
 
 define STAGE_TEST
diff --git a/pkgs/guile/patches/guile-1.8.7-testsuite2.patch b/pkgs/guile/patches/guile-1.8.7-testsuite2.patch
deleted file mode 100644
index 279fc97b2..000000000
--- a/pkgs/guile/patches/guile-1.8.7-testsuite2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-commit a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf
-Author: Ludovic Courtès <ludo@gnu.org>
-Date:   Mon Dec 14 10:59:25 2009 +0100
-
-    Fix test environment issue with ltdl from Libtool 2.2.6b.
-    
-    Earlier versions of ltdl would look for extensions under $PWD; this
-    behavior changed in 2.2.6b.
-    
-    * test-suite/standalone/Makefile.am (TESTS_ENVIRONMENT): Define
-      $builddir.
-    
-    * test-suite/standalone/test-asmobs: Specify the full path to
-      `libtest-asmobs', using $builddir.
-
-diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am
-index e7cfd82..058ce93 100644
---- a/test-suite/standalone/Makefile.am
-+++ b/test-suite/standalone/Makefile.am
-@@ -28,7 +28,9 @@ check_SCRIPTS =
- BUILT_SOURCES =
- EXTRA_DIST =
- 
--TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
-+TESTS_ENVIRONMENT = 						\
-+  builddir="$(builddir)"					\
-+  "${top_builddir}/pre-inst-guile-env"
- 
- test_cflags =					\
-   -I$(top_srcdir)/test-suite/standalone		\
-diff --git a/test-suite/standalone/test-asmobs b/test-suite/standalone/test-asmobs
-index 2ea75d9..9689ab9 100755
---- a/test-suite/standalone/test-asmobs
-+++ b/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
-diff -up guile-1.8.7/test-suite/standalone/Makefile.in.ltdl guile-1.8.7/test-suite/standalone/Makefile.in
---- guile-1.8.7/test-suite/standalone/Makefile.in.ltdl	2010-01-15 14:40:52.000000000 +0100
-+++ guile-1.8.7/test-suite/standalone/Makefile.in	2010-01-15 14:48:10.000000000 +0100
-@@ -392,7 +392,9 @@ check_SCRIPTS = test-system-cmds test-re
- 	test-use-srfi
- BUILT_SOURCES = test-asmobs-lib.x
- EXTRA_DIST = $(am__append_3) ${check_SCRIPTS}
--TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
-+TESTS_ENVIRONMENT = \
-+  builddir="$(builddir)" \
-+  "${top_builddir}/pre-inst-guile-env"
- test_cflags = \
-   -I$(top_srcdir)/test-suite/standalone		\
-   -I$(top_srcdir) -I$(top_builddir)		\