Mercurial > gub
changeset 6007:fdef984a92a0
guile: support info command. tools::guile: keep devel stuff.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 05 Nov 2010 21:01:51 +0100 |
| parents | 3545a5b7b160 |
| children | c3f43da16d10 |
| files | gub/specs/guile.py |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/guile.py Fri Nov 05 21:01:16 2010 +0100 +++ b/gub/specs/guile.py Fri Nov 05 21:01:51 2010 +0100 @@ -117,6 +117,7 @@ prefix=%(system_prefix)s test "$1" = "compile" && echo "-I$prefix/include" test "$1" = "link" && echo "-L$prefix/lib -lguile -lgmp" +test "$1" = "info" && test "$2" = "guileversion" && echo "%(version)s" exit 0 ''', '%(install_prefix)s%(cross_dir)s/bin/%(target_architecture)s-guile-config') @@ -157,6 +158,7 @@ Guile.install (self) # dlopen-able .la files go in BIN dir, BIN OR LIB package self.system ('''mv %(install_prefix)s/lib/lib*[0-9].la %(install_prefix)s/bin''') + self.system ('''cd %(install_prefix)s/bin && cp guile.exe guile-windows.exe''') class Guile__linux (Guile): compile_command = ('export LD_LIBRARY_PATH=%(builddir)s/libguile/.libs:$LD_LIBRARY_PATH;' @@ -224,6 +226,7 @@ Guile.autopatch (self) def install (self): tools.AutoBuild.install (self) - # Ugh: remove development stuff from tools - # Make sure no tool GUILE headers can interfere with compile. - self.system ("rm -rf %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/include/ %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/bin/guile-config ") + self.system ('cd %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/bin && cp guile guile-1.8') + 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)