]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
guile: New package.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Jul 2010 15:04:13 +0000 (17:04 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Jul 2010 15:04:13 +0000 (17:04 +0200)
Required for autogen.

pkgs/core/guile/guile.nm [new file with mode: 0644]
pkgs/core/guile/patches/guile-1.8.7-linemarkers.patch [new file with mode: 0644]
pkgs/core/guile/patches/guile-1.8.7-testsuite.patch [new file with mode: 0644]
pkgs/core/guile/patches/guile-1.8.7-testsuite2.patch [new file with mode: 0644]

diff --git a/pkgs/core/guile/guile.nm b/pkgs/core/guile/guile.nm
new file mode 100644 (file)
index 0000000..6a9b0f0
--- /dev/null
@@ -0,0 +1,52 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME       = guile
+PKG_VER        = 1.8.7
+PKG_REL        = 0
+
+PKG_MAINTAINER =
+PKG_GROUP      = Development/Tools
+PKG_URL        = http://www.gnu.org/software/guile/
+PKG_LICENSE    = GPLv2+ and LGPLv2+ and GFDL and OFSFDL
+PKG_SUMMARY    = A GNU implementation of Scheme for application extensibility.
+
+PKG_DEPS      += gmp libtool
+
+define PKG_DESCRIPTION
+       GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library \
+       implementation of the Scheme programming language, written in C. GUILE \
+       provides a machine-independent execution platform that can be linked in \
+       as a library during the building of extensible programs.
+endef
+
+PKG_TARBALL    = $(THISAPP).tar.gz
+
+QUALITY_AGENT_WHITELIST_RPATH = /usr/lib
+
+define STAGE_TEST
+       cd $(DIR_APP) && make check
+endef
diff --git a/pkgs/core/guile/patches/guile-1.8.7-linemarkers.patch b/pkgs/core/guile/patches/guile-1.8.7-linemarkers.patch
new file mode 100644 (file)
index 0000000..4330c24
--- /dev/null
@@ -0,0 +1,21 @@
+diff -up guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers guile-1.8.7/libguile/guile-snarf-docs.in
+--- guile-1.8.7/libguile/guile-snarf-docs.in.linemarkers       2009-07-04 00:19:00.000000000 +0200
++++ guile-1.8.7/libguile/guile-snarf-docs.in   2009-11-19 17:58:03.000000000 +0100
+@@ -23,4 +23,4 @@ bindir=`dirname $0`
+ ## Let the user override the preprocessor autoconf found.
+ test -n "${CPP+set}" || CPP="@CPP@"
+-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
++${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
+diff -up guile-1.8.7/libguile/guile-snarf.in.linemarkers guile-1.8.7/libguile/guile-snarf.in
+--- guile-1.8.7/libguile/guile-snarf.in.linemarkers    2009-11-19 16:31:46.000000000 +0100
++++ guile-1.8.7/libguile/guile-snarf.in        2009-11-19 18:10:09.000000000 +0100
+@@ -49,7 +49,7 @@ modern_snarf ()                         
+     ## Apparently, AIX's preprocessor is unhappy if you try to #include an
+     ## empty file.
+     echo "/* cpp arguments: $@ */" ;
+-    ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
++    ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+     grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
diff --git a/pkgs/core/guile/patches/guile-1.8.7-testsuite.patch b/pkgs/core/guile/patches/guile-1.8.7-testsuite.patch
new file mode 100644 (file)
index 0000000..f4d5269
--- /dev/null
@@ -0,0 +1,12 @@
+diff -up guile-1.8.7/test-suite/tests/popen.test.testsuite guile-1.8.7/test-suite/tests/popen.test
+--- guile-1.8.7/test-suite/tests/popen.test.testsuite  2009-07-04 00:19:00.000000000 +0200
++++ guile-1.8.7/test-suite/tests/popen.test    2009-07-16 17:09:57.000000000 +0200
+@@ -168,7 +168,7 @@
+          (port (with-error-to-port (cdr c2p)
+                  (lambda ()
+                    (open-output-pipe
+-                    "exec 0</dev/null; while true; do echo closed 1>&2; done")))))
++                    "exec 0</dev/null; echo closed 1>&2; sleep 3")))))
+       (close-port (cdr c2p))   ;; write side
+       (with-epipe
+        (lambda ()
diff --git a/pkgs/core/guile/patches/guile-1.8.7-testsuite2.patch b/pkgs/core/guile/patches/guile-1.8.7-testsuite2.patch
new file mode 100644 (file)
index 0000000..279fc97
--- /dev/null
@@ -0,0 +1,58 @@
+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)           \