rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the rtems-tools waf --destdir path on Windows.

Browse Source 
Waf requires the drive be added to the destdir path so it installs to a path
the RSB knows. The RSB assumes the destdir contains an MSYS drive path as
seen in the POSIX path. This is default for configure scripts.

Also fix the git URL to pull before the branch command as well as after to
update the branch.

Closes #2605.
This commit is contained in:
Chris Johns 2016-02-22 17:38:32 +11:00
parent aa3fdad01a
commit 34dfc8380d
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtems/config/tools/rtems-tools-1.cfg
View File

@ -38,7 +38,7 @@
%define rtems_tools_git_checkout %{nil}
%endif
%source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
%source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
%endif
#

17
rtems/config/tools/rtems-tools-common-1.cfg
View File

@ -10,7 +10,7 @@ Version: %{rtems_tools_version}
Release: %{release}
URL: http://www.rtems.org/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
License: BSD-2-Caluse + GPL-2.0
License: BSD-2-Clause + GPL-2.0
#
# Prepare the source code.
@ -51,6 +51,19 @@ License: BSD-2-Caluse + GPL-2.0
%{__rmdir} $SB_BUILD_ROOT
#
# If on Windows we need to add the driver prefix to the built root as waf
# strips the driver prefix from the prefix path when joining it to the
# destdir path. Waf is correct in doing this and the RSB is design to match
# the configure behaviour which treats the whole path including the drive
# prefix as part of the path as just a path.
#
%ifos win32 mingw ming32
SB_BUILD_ROOT_WAF=$SB_BUILD_ROOT$(echo %{_prefix} | cut -c 1-2)
%else
SB_BUILD_ROOT_WAF=$SB_BUILD_ROOT
%endif
cd ${source_dir_rtems_tools}
./waf --destdir=$SB_BUILD_ROOT install
./waf --destdir=$SB_BUILD_ROOT_WAF install
cd ${build_top}