rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-06-17 06:02:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

2010-08-29 Chris Johns <chrisj@rtems.org>

Browse Source 
* specbuilder/specbuilder/defaults.py: Add default configure
        macro. Add --dry-run to the parsed arguments. Fix the case when
        run on a new host that does not have default support.
This commit is contained in:
Chris Johns 2010-08-28 23:01:20 +00:00
parent f1a0bde7a0
commit 9eb5c92f1e
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-29 Chris Johns <chrisj@rtems.org>
* specbuilder/specbuilder/defaults.py: Add default configure
macro. Add --dry-run to the parsed arguments. Fix the case when
run on a new host that does not have default support.
2010-08-13 Chris Johns <chrisj@rtems.org> 2010-08-13 Chris Johns <chrisj@rtems.org>
* specbuilder/specbuilder/defaults.py: Provide a default shell. * specbuilder/specbuilder/defaults.py: Provide a default shell.

24
specbuilder/specbuilder/defaults.py
View File

@ -148,6 +148,26 @@ cd "%{_builddir}"''',
'_usrsrc': '%{_usr}/src', '_usrsrc': '%{_usr}/src',
'_var': '/usr/local/var', '_var': '/usr/local/var',
'_varrun': '%{_var}/run', '_varrun': '%{_var}/run',
'configure': '''
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ;
./configure --build=%{_build} --host=%{_host} \
--target=%{_target_platform} \
--program-prefix=%{?_program_prefix} \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} \
--sbindir=%{_sbindir} \
--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--includedir=%{_includedir} \
--libdir=%{_libdir} \
--libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} \
--mandir=%{_mandir} \
--infodir=%{_infodir}''',
'nil': '' 'nil': ''
} }
@ -176,6 +196,7 @@ class command_line:
'--rtems' : '_rtemssrc' } '--rtems' : '_rtemssrc' }
_long_true_opts = { '--trace' : '_trace', _long_true_opts = { '--trace' : '_trace',
'--dry-run' : '_dry_run',
'--warn-all' : '_warn_all', '--warn-all' : '_warn_all',
'--no-clean' : '_no_clean', '--no-clean' : '_no_clean',
'--no-smp' : '_no_smp', '--no-smp' : '_no_smp',
@ -398,10 +419,13 @@ def load(args):
if uname[0] == 'Darwin': if uname[0] == 'Darwin':
import darwin import darwin
overrides = darwin.load() overrides = darwin.load()
if overrides is None:
raise error.general('no hosts defaults found; please add')
for k in overrides: for k in overrides:
d[k] = overrides[k] d[k] = overrides[k]
import rtems import rtems
overrides = rtems.load() overrides = rtems.load()
if overrides is not None:
for k in overrides: for k in overrides:
d[k] = overrides[k] d[k] = overrides[k]
o = command_line(args) o = command_line(args)