Hi David,
Il giorno mer, 29/08/2012 alle 16.37 +0200, David Kastrup ha scritto:
> Hi, I just looked at the repository, and picked out the patch that was
> required for bypassing the bashism. However, I don't think that the
> "touch all manual pages" thing actually belongs in there and should
> likely get removed before committing this.
>
> John, is this correct?
If you don't include the "touch all manual pages" in your commit, GUB
build of tools::texinfo shall fail for every system, whether help2man is
available system-wide or not, as in this case Texinfo build does not
look for binaries in /usr/bin, at least not help2man.
If you find touching files like in this patch too ugly, a proper
solution is to add a GUB spec file for help2man (with a dependency on
Perl IIRC, which IIRC is already built in tools GUB target) and add its
dependency in Texinfo spec file.
Best,
John
>From faa7fadcdea789287e4a8e7ef0b7eccfbf29a790 Mon Sep 17 00:00:00 2001
From: administrator <administrator@administrator-OptiPlex-760.(none)>
Date: Tue, 28 Aug 2012 18:18:30 +0200
Subject: [PATCH] Work around a bashism/optimism breaking dash in texi2dvi
shellscript
---
gub/specs/texinfo.py | 10 ++++++++++
patches/texinfo-texi2dvi-4.13a.patch | 20 ++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 patches/texinfo-texi2dvi-4.13a.patch
diff --git a/gub/specs/texinfo.py b/gub/specs/texinfo.py
index 746d8a3..e8e33f0 100644
--- a/gub/specs/texinfo.py
+++ b/gub/specs/texinfo.py
@@ -2,7 +2,17 @@ from gub import tools
class Texinfo__tools (tools.AutoBuild):
source = 'http://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz'
+ patches = [
+ 'texinfo-texi2dvi-4.13a.patch',
+ ]
def patch (self):
tools.AutoBuild.patch (self)
# Drop ncurses dependency
self.file_sub ([(' info ',' ')], '%(srcdir)s/Makefile.in')
+ def autoupdate (self):
+ # We don't want to rebuild Texinfo man pages
+ #
+ tools.AutoBuild.autoupdate (self)
+ self.system ('''
+cd %(srcdir)s && touch doc/*.1
+''')
diff --git a/patches/texinfo-texi2dvi-4.13a.patch b/patches/texinfo-texi2dvi-4.13a.patch
new file mode 100644
index 0000000..37cff3e
--- /dev/null
+++ b/patches/texinfo-texi2dvi-4.13a.patch
@@ -0,0 +1,20 @@
+diff --git a/util/texi2dvi b/util/texi2dvi
+index 18b2214..7e5855a 100644
+--- a/util/texi2dvi
++++ b/util/texi2dvi
+@@ -129,12 +129,13 @@
+ }
+ test_local
+ test $foo = bar
+-) || local () {
++) || eval '
++local () {
+ case $1 in
+ *=*) eval "$1";;
+ esac
+ }
+-
++'
+
+ # cd_orig
+ # -------
--
1.7.9.5
_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
