aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-01-21 17:30:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 21:55:48 +0000
commit977372f806dfe597cd14244e7a4db0caba5c65b2 (patch)
treeec0e8c3e071795cc952a9d9810140fc0668ef832
parent80848b0df18e5a962adda35750431e28c19f9204 (diff)
downloadopenembedded-core-977372f806dfe597cd14244e7a4db0caba5c65b2.tar.gz
openembedded-core-977372f806dfe597cd14244e7a4db0caba5c65b2.tar.bz2
openembedded-core-977372f806dfe597cd14244e7a4db0caba5c65b2.zip
guile: fix build with Texinfo 5.0
Backport a patch from upstream which fixes failures building guile-native on newer distros such as Ubuntu 13.10. (This does not affect dora or master because we are using Guile 2.0.9 there, which already contains this patch.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch71
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.7.bb1
2 files changed, 72 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
new file mode 100644
index 0000000000..f39905c85e
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
@@ -0,0 +1,71 @@
+From 183d2ace576710079a2bcf2a8bfcbc39b7d9becc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
+Date: Fri, 1 Mar 2013 17:49:24 +0100
+Subject: [PATCH] doc: Fix build with Texinfo 5.0.
+
+* doc/ref/api-control.texi (Handling Errors): Move misplaced description
+ for `scm_memory_error' & co.
+* doc/ref/r6rs.texi (rnrs base): Change `deffnx' of `let-syntax' and
+ `letrec-syntax' to fit on one line.
+
+Upstream-Status: Backport [in 2.0.9 release]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+---
+ doc/ref/api-control.texi | 6 +++---
+ doc/ref/r6rs.texi | 8 +++-----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/doc/ref/api-control.texi b/doc/ref/api-control.texi
+index 95c4925..ea943d3 100644
+--- a/doc/ref/api-control.texi
++++ b/doc/ref/api-control.texi
+@@ -1,7 +1,7 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011, 2012
+-@c Free Software Foundation, Inc.
++@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010,
++@c 2011, 2012, 2013 Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+
+ @node Control Mechanisms
+@@ -1732,8 +1732,8 @@ and the call to these routines doesn't change @code{errno}.
+ @deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value})
+ @deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}, const char *@var{expected})
+ @deftypefnx {C Function} void scm_memory_error (char *@var{subr})
+-Throw an error with the various keys described above.
+ @deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const char *@var{message}, SCM @var{args})
++Throw an error with the various keys described above.
+
+ In @code{scm_wrong_num_args}, @var{proc} should be a Scheme symbol
+ which is the name of the procedure incorrectly invoked. The other
+diff --git a/doc/ref/r6rs.texi b/doc/ref/r6rs.texi
+index 2028ada..13f9e20 100644
+--- a/doc/ref/r6rs.texi
++++ b/doc/ref/r6rs.texi
+@@ -1,6 +1,6 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C) 2010, 2011, 2012
++@c Copyright (C) 2010, 2011, 2012, 2013
+ @c Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+
+@@ -273,10 +273,8 @@ grouped below by the existing manual sections to which they correspond.
+ @end deffn
+
+ @deffn {Scheme Syntax} define-syntax keyword expression
+-@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{})
+- exp1 exp2 @dots{}
+-@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{})
+- exp1 exp2 @dots{}
++@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{}) exp1 exp2 @dots{}
++@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{}) exp1 exp2 @dots{}
+ @xref{Defining Macros}, for documentation.
+ @end deffn
+
+--
+1.8.4.2
+
diff --git a/meta/recipes-devtools/guile/guile_2.0.7.bb b/meta/recipes-devtools/guile/guile_2.0.7.bb
index 5863014fe5..e7191a7fea 100644
--- a/meta/recipes-devtools/guile/guile_2.0.7.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.7.bb
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
file://guile_2.0.6_fix_sed_error.patch \
file://arm_endianness.patch \
file://fix_parallel_build_issue.patch \
+ file://0001-doc-Fix-build-with-Texinfo-5.0.patch \
"
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch