Mercurial > gub
changeset 6449:03f54f905e14
Update guile-* packages for guile-1.9.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sat, 29 Jan 2011 20:31:47 +0100 |
| parents | e1181d222682 |
| children | 19fc7fdaa53a |
| files | gub/specs/g-wrap.py gub/specs/guile-cairo.py gub/specs/guile-config.py gub/specs/guile-gnome.py |
| diffstat | 4 files changed, 27 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/g-wrap.py Sat Jan 29 20:30:27 2011 +0100 +++ b/gub/specs/g-wrap.py Sat Jan 29 20:31:47 2011 +0100 @@ -1,3 +1,6 @@ +import os +# +from gub import build from gub import target from gub import tools @@ -8,7 +11,11 @@ 'libffi', 'tools::g-wrap', ] - source = 'http://download.savannah.gnu.org/releases/g-wrap/g-wrap-1.9.13.tar.gz' + source = 'http://download.savannah.gnu.org/releases/g-wrap/g-wrap-1.9.13.1.tar.gz' + def __init__ (self, settings, source): + target.AutoBuild.__init__ (self, settings, source) + build.add_dict (self, {'GUILE_LOAD_COMPILED_PATH': '%(tools_prefix)s/lib/guile/2.0/ccache'}) + build.add_dict (self, {'LIBRESTRICT_ALLOW': os.environ['HOME'] + '/.cache'}) def configure (self): target.AutoBuild.configure (self) self.file_sub ([('-std=gnu99', '')], '%(builddir)s/guile/g-wrap/Makefile') @@ -34,6 +41,10 @@ self.file_sub ([('-Werror', '')], i, must_succeed=True) class G_wrap__tools (tools.AutoBuild, G_wrap): + def __init__ (self, settings, source): + tools.AutoBuild.__init__ (self, settings, source) + build.add_dict (self, {'GUILE_LOAD_COMPILED_PATH': '%(tools_prefix)s/lib/guile/2.0/ccache'}) + build.add_dict (self, {'LIBRESTRICT_ALLOW': os.environ['HOME'] + '/.cache'}) def configure (self): tools.AutoBuild.configure (self) for i in ('%(builddir)s/guile/g-wrap/Makefile',
--- a/gub/specs/guile-cairo.py Sat Jan 29 20:30:27 2011 +0100 +++ b/gub/specs/guile-cairo.py Sat Jan 29 20:31:47 2011 +0100 @@ -3,8 +3,8 @@ class Guile_cairo (target.AutoBuild): source = 'http://download.gna.org/guile-cairo/guile-cairo-1.4.0.tar.gz' dependencies = [ - 'cairo', - 'guile', + 'cairo-devel', + 'guile-devel', ] subpackage_names = [''] def install (self):
--- a/gub/specs/guile-config.py Sat Jan 29 20:30:27 2011 +0100 +++ b/gub/specs/guile-config.py Sat Jan 29 20:31:47 2011 +0100 @@ -14,8 +14,8 @@ test "$1" = "--version" && echo "%(target_architecture)s-guile-config - Guile version %(version)s" #prefix=$(dirname $(dirname $0)) prefix=%(system_prefix)s -test "$1" = "compile" && echo "-I$prefix/include" -test "$1" = "link" && echo "-L$prefix/lib -lguile -lgmp" +test "$1" = "compile" && echo "-I$prefix/include/guile/2.0" +test "$1" = "link" && echo "-L$prefix/lib -lguile-2.0 -lgmp" test "$1" = "info" && test "$2" = "guileversion" && echo "%(version)s" exit 0 ''',
--- a/gub/specs/guile-gnome.py Sat Jan 29 20:30:27 2011 +0100 +++ b/gub/specs/guile-gnome.py Sat Jan 29 20:31:47 2011 +0100 @@ -1,3 +1,6 @@ +import os +# +from gub import build from gub import target from gub import tools @@ -13,6 +16,10 @@ # force_autoupdate = True configure_flags = target.AutoBuild.configure_flags + ' --disable-Werror' subpackage_names = [''] + def __init__ (self, settings, source): + target.AutoBuild.__init__ (self, settings, source) + build.add_dict (self, {'GUILE_LOAD_COMPILED_PATH': '%(tools_prefix)s/lib/guile/2.0/ccache'}) + build.add_dict (self, {'LIBRESTRICT_ALLOW': os.environ['HOME'] + '/.cache'}) def patch (self): self.system ('''cd %(srcdir)s && scripts/configure-packages guile-gnome-schikkers''') self.dump ('''xgconf-guile-gnome-schikkers: atk cairo defs gconf glib gtk libglade libgnomecanvas pango @@ -55,4 +62,7 @@ ] class Guile_gnome__tools (tools.AutoBuild, Guile_gnome): - pass + def __init__ (self, settings, source): + tools.AutoBuild.__init__ (self, settings, source) + build.add_dict (self, {'GUILE_LOAD_COMPILED_PATH': '%(tools_prefix)s/lib/guile/2.0/ccache'}) + build.add_dict (self, {'LIBRESTRICT_ALLOW': os.environ['HOME'] + '/.cache'})