Mercurial > gub
changeset 4:3c4b27fcdec0
(no comment)
| author | hanwen <hanwen@xs4all.nl> |
|---|---|
| date | Tue, 22 Nov 2005 01:29:48 +0100 |
| parents | 3fd05f082eb5 |
| children | 536bb806a189 |
| files | ChangeLog driver.py specs/framework.py specs/gub.py |
| diffstat | 4 files changed, 22 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ChangeLog Tue Nov 22 01:29:48 2005 +0100 @@ -0,0 +1,5 @@ +2005-11-22 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * gub.py (Target_package.configure_command): trim + directories. Install headers in /garbage/ +
--- a/driver.py Mon Nov 21 21:48:21 2005 +0100 +++ b/driver.py Tue Nov 22 01:29:48 2005 +0100 @@ -25,12 +25,13 @@ settings.installdir = settings.targetdir + '/install/' settings.statusdir = settings.targetdir + '/status/' settings.tooldir = settings.targetdir + '/tools/' +settings.garbagedir = settings.targetdir + '/garbage/' os.environ["PATH"] = '%s/%s:%s' % (settings.tooldir, 'bin', os.environ["PATH"]) def create_dirs (settings): - for a in ['topdir', 'statusdir', + for a in ['topdir', 'statusdir', 'garbagedir', 'downloaddir', 'srcdir', 'specdir', 'targetdir', 'systemdir']: try:
--- a/specs/framework.py Mon Nov 21 21:48:21 2005 +0100 +++ b/specs/framework.py Tue Nov 22 01:29:48 2005 +0100 @@ -5,7 +5,8 @@ class Gettext (gub.Target_package): def __init__ (self, settings): gub.Package.__init__ (self, settings) - self.url = 'ftp://dl.xs4all.nl/pub/mirror/gnu/gettext/gettext-0.14.tar.gz' + self.url = 'ftp://dl.xs4all.nl/pub/mirror/gnu/gettext/gettext-0.10.40.tar.gz' + # ftp://dl.xs4all.nl/pub/mirror/gnu/gettext/gettext-0.14.tar.gz' def configure_cache_overrides (self, str): str = re.sub ('ac_cv_func_select=yes','ac_cv_func_select=no', str)
--- a/specs/gub.py Mon Nov 21 21:48:21 2005 +0100 +++ b/specs/gub.py Tue Nov 22 01:29:48 2005 +0100 @@ -111,21 +111,26 @@ cmd = Package.configure_command (self) cmd += ' --target=%s --with-sysroot=%s ' % (self.settings.target_architecture, self.settings.systemdir) return cmd - - class Target_package (Package): def configure_command (self): - flags = '--config-cache --enable-shared --disable-static --build=%(build_spec)s --host=%(target_architecture)s --target=%(target_architecture)s --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --libdir=/usr/lib --includedir=/nonexistent/include --libexecdir=/usr/sbin' + # --config-cache + flags = ' --enable-shared --disable-static --build=%(build_spec)s --host=%(target_architecture)s --target=%(target_architecture)s --prefix=/usr --sysconfdir=/etc --includedir=%(garbagedir)s ' flags = flags % self.settings.__dict__ return '%s/configure %s' % (self.srcdir(), flags) def configure_cache_overrides (self,str): - return str - + return str + + def installdir (self): + return self.settings.installdir + "/" + self.name () + "-root/" + + def install_command (self): + return 'make prefix=%s install' % self.installdir () + def configure (self): - self.system ("mkdir -p %s") + self.system ("mkdir -p %s" % self.builddir ()) cache_fn = self.builddir () +'/config.cache' cache = open (cache_fn, 'w') str = cross.cross_config_cache + cross.cygwin @@ -139,12 +144,10 @@ def system (self, cmd): dict = {'CXX':'%(target_architecture)s-g++ %(target_gcc_flags)s', - 'CXX_FOR_TARGET':'%(target_architecture)s-g++ %(target_gcc_flags)s', - 'CC':'%(target_architecture)sgcc %(target_gcc_flags)s', - 'CC_FOR_TARGET': '%(target_architecture)sgcc %(target_gcc_flags)s', + 'CC':'%(target_architecture)s-gcc %(target_gcc_flags)s', 'RANLIB': '%(target_architecture)s-ranlib', - 'RANLIB_FOR_TARGET': '%(target_architecture)s-ranlib', 'DLLWRAP' : '%(target_architecture)s-dllwrap', + 'LD': '%(target_architecture)s-ld', 'AR': '%(target_architecture)s-ar', 'NM': '%(target_architecture)s-nm'}