Mercurial > gub

changeset 6445:64050ee2dd8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tools32::guile: Support building linux-x86 and mingw[32] guile on linux-64.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 28 Feb 2011 11:46:07 +0100
parents 1455e040df43
children aca315bf607b
files gub/specs/guile.py
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/guile.py	Sat Jan 29 20:47:54 2011 +0100
+++ b/gub/specs/guile.py	Mon Feb 28 11:46:07 2011 +0100
@@ -7,6 +7,7 @@
 from gub import repository
 from gub import target
 from gub import tools
+from gub import tools32
 
 class Guile (target.AutoBuild):
     # source = 'git://git.sv.gnu.org/guile.git&branch=branch_release-1-8&revision=bba579611b3671c7e4c1515b100f01c048a07935'
@@ -66,12 +67,12 @@
                             + ' cross_compiling=yes ')
     # FIXME: guile runs gen_scmconfig [when not x-building also guile]
     # without setting the proper LD_LIBRARY_PATH.
-    configure_command = ('GUILE_FOR_BUILD=%(tools_prefix)s/bin/guile '
+    configure_command = ('GUILE_FOR_BUILD=%(tools_archmatch_prefix)s/bin/guile '
                          + target.AutoBuild.configure_command
                          + guile_configure_flags)
-    compile_command = ('export preinstguile=%(tools_prefix)s/bin/guile; '
+    compile_command = ('export preinstguile=%(tools_archmatch_prefix)s/bin/guile; '
                        + target.AutoBuild.compile_command)
-    install_command = ('export preinstguile=%(tools_prefix)s/bin/guile; '
+    install_command = ('export preinstguile=%(tools_archmatch_prefix)s/bin/guile; '
                        + target.AutoBuild.install_command)
     subpackage_names = ['doc', 'devel', 'runtime', '']
     @staticmethod
@@ -89,7 +90,7 @@
         self.so_version = '17'
     def patch (self):
         self.dump ('''#!/bin/sh
-exec %(tools_prefix)s/bin/guile "$@"
+exec %(tools_archmatch_prefix)s/bin/guile "$@"
 ''', "%(srcdir)s/pre-inst-guile.in")
         #self.autopatch ()
         target.AutoBuild.patch (self)
@@ -274,3 +275,6 @@
 #        self.file_sub ([('[(]string-join other-flags[)]', '(string-join (filter (lambda (x) (not (equal? x "-L/usr/lib"))) other-flags))')],
 #                       '%(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/bin/guile-config',
 #                       must_succeed=True)
+
+class Guile__tools32 (tools32.AutoBuild, Guile__tools):
+    pass