diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-03-05 19:43:43 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-03-05 19:43:43 +1100 |
| commit | 0606a65718af9f93ad5f7dd1fb2175e7157b879e (patch) | |
| tree | a8935164ddf6d240ad8e5a1625f1269d28cc30fe | |
| parent | Clean up the per target C/C++ handling. (diff) | |
| download | rtems-source-builder-0606a65718af9f93ad5f7dd1fb2175e7157b879e.tar.bz2 | |
Clean path when building autoconf and automake.
Autoconf hard codes paths into itself. This change is a first
pass at allowing a clean environment to let automake build. The
ability to 'make install DESTDIR=xxx' autoconf then use it to
build automake needs a clean environment. The purpose is to
allow a prefix that needs root without building and packaging
when root.
| -rw-r--r-- | source-builder/config/autoconf-2-1.cfg | 9 | ||||
| -rw-r--r-- | source-builder/config/automake-1-1.cfg | 8 | ||||
| -rw-r--r-- | source-builder/sb/setbuilder.py | 1 |
3 files changed, 14 insertions, 4 deletions
diff --git a/source-builder/config/autoconf-2-1.cfg b/source-builder/config/autoconf-2-1.cfg index e56a526..c3d0dff 100644 --- a/source-builder/config/autoconf-2-1.cfg +++ b/source-builder/config/autoconf-2-1.cfg @@ -31,10 +31,15 @@ cd autoconf-%{autoconf_version} cd .. %build - export PATH="%{_bindir}:${PATH}" + if test "%{_internal_autotools}" == "yes"; then + export PATH="%{_bindir}:${PATH}" + else + export PATH=$SB_ORIG_PATH + fi + cd autoconf-%{autoconf_version} - if "%{_internal_autotools}" == "yes"; then + if test "%{_internal_autotools}" == "yes"; then ac_prefix=$SB_TMPPREFIX else ac_prefix=%{_prefix} diff --git a/source-builder/config/automake-1-1.cfg b/source-builder/config/automake-1-1.cfg index a234e87..41a8c29 100644 --- a/source-builder/config/automake-1-1.cfg +++ b/source-builder/config/automake-1-1.cfg @@ -31,11 +31,15 @@ cd automake-%{automake_version} cd .. %build - export PATH="%{_bindir}:${PATH}" + if test "%{_internal_autotools}" == "yes"; then + export PATH="%{_bindir}:${PATH}" + else + export PATH=$SB_ORIG_PATH + fi cd automake-%{automake_version} - if "%{_internal_autotools}" == "yes"; then + if test "%{_internal_autotools}" == "yes"; then am_prefix=$SB_TMPPREFIX else am_prefix=%{_prefix} diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index d104bf1..1243aa0 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -133,6 +133,7 @@ class buildset: # exporting to the environment os.environ['SB_TMPPREFIX'] = tmpprefix os.environ['SB_TMPBINDIR'] = tmpbindir + os.environ['SB_ORIG_PATH'] = os.environ['PATH'] os.environ['PATH'] = path.host(tmpbindir) + os.pathsep + os.environ['PATH'] self._output('path: ' + os.environ['PATH']) # shell format |