diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-05-13 14:44:49 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-05-13 14:44:49 +1000 |
| commit | 5237f1ccb77342d17eac2b97b274726722d2e914 (patch) | |
| tree | fca51d8d162d27af2f35915e4ae57f34d1b0eae2 /source-builder/defaults.mc | |
| parent | Add an RTEMS config wrapper around Makefile.inc. (diff) | |
| download | rtems-source-builder-5237f1ccb77342d17eac2b97b274726722d2e914.tar.bz2 | |
Fix support for Windows (MinGW) native builds using MSYS.
Fix paths that need to be coverted to host format.
The shell expansion needs to invoke a shell on Windows as cmd.exe
will not work.
Munch the paths into smaller sizes for Windows due to the limited
path size.
Diffstat (limited to 'source-builder/defaults.mc')
| -rw-r--r-- | source-builder/defaults.mc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source-builder/defaults.mc b/source-builder/defaults.mc index 5683969..274cc9f 100644 --- a/source-builder/defaults.mc +++ b/source-builder/defaults.mc @@ -43,12 +43,16 @@ _bset: none, none, '' name: none, none, '' version: none, none, '' release: none, none, '' +buildname: none, none, '%{name}' # GNU triples needed to build packages _host: triplet, required, '' _build: triplet, required, '%{_host}' _target: none, optional, '' +# The user +_uid: none, convert, '%(%{__id_u} -n)' + # Paths _host_platform: none, none, '%{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu}' _arch: none, none, '%{_host_arch}' @@ -57,14 +61,14 @@ _configdir: dir, optional, '%{_topdir}/config:%{_sbdir}/config' _tardir: dir, optional, '%{_topdir}/tar' _sourcedir: dir, optional, '%{_topdir}/sources' _patchdir: dir, optional, '%{_topdir}/patches:%{_sbdir}/patches' -_builddir: dir, optional, '%{_topdir}/build/%{name}-%{version}-%{release}' -_buildcxcdir: dir, optional, '%{_topdir}/build/%{name}-%{version}-%{release}-cxc' +_builddir: dir, optional, '%{_topdir}/build/%{buildname}' +_buildcxcdir: dir, optional, '%{_topdir}/build/%{buildname}-cxc' _docdir: dir, none, '%{_defaultdocdir}' _tmppath: dir, none, '%{_topdir}/build/tmp' -_tmproot: dir, none, '%{_tmppath}/source-build-%(%{__id_u} -n)/%{_bset}' -_tmpcxcroot: dir, none, '%{_tmppath}/source-build-%(%{__id_u} -n)-cxc/%{_bset}' -buildroot: dir, none, '%{_tmppath}/%{name}-root-%(%{__id_u} -n)' -buildcxcroot: dir, none, '%{_tmppath}/%{name}-root-%(%{__id_u} -n)-cxc' +_tmproot: dir, none, '%{_tmppath}/sb-%{_uid}/%{_bset}' +_tmpcxcroot: dir, none, '%{_tmppath}/sb-%{_uid}-cxc/%{_bset}' +buildroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}' +buildcxcroot: dir, none, '%{_tmppath}/%{buildname}-%{_uid}-cxc' _datadir: dir, none, '%{_prefix}/share' _defaultdocdir: dir, none, '%{_prefix}/share/doc' _exeext: none, none, '' @@ -175,6 +179,7 @@ SB_DOC_DIR="%{_docdir}" export SB_DOC_DIR # Packages SB_PACKAGE_NAME="%{name}" +SB_PACKAGE_BUILDNAME="%{buildname}" SB_PACKAGE_VERSION="%{version}" SB_PACKAGE_RELEASE="%{release}" export SB_PACKAGE_NAME SB_PACKAGE_VERSION SB_PACKAGE_RELEASE |