diff options
| author | dirkbaechle <devnull@localhost> | 2012-09-27 22:35:09 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-09-27 22:35:09 (GMT) |
| commit | a6d1f2c5f7282a4c25bc20059054cbc0a6d9a688 (patch) | |
| tree | 1781448eb906652d808ea4bf50fdda4312fe23c1 /src/engine/SCons/Tool/packaging/rpm.py | |
| parent | edbb8113bf8737e7bc77a4f23d7fd41a44dca5a6 (diff) | |
| download | SCons-a6d1f2c5f7282a4c25bc20059054cbc0a6d9a688.zip SCons-a6d1f2c5f7282a4c25bc20059054cbc0a6d9a688.tar.gz SCons-a6d1f2c5f7282a4c25bc20059054cbc0a6d9a688.tar.bz2 | |
- several smaller fixes to get all tests running under Buildbot again
Diffstat (limited to 'src/engine/SCons/Tool/packaging/rpm.py')
| -rw-r--r-- | src/engine/SCons/Tool/packaging/rpm.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index 1ea50de..07857d1 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -30,6 +30,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os import SCons.Builder +import SCons.Tool.rpmutils from SCons.Environment import OverrideEnvironment from SCons.Tool.packaging import stripinstallbuilder, src_targz @@ -52,16 +53,7 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION, else: # This should be overridable from the construction environment, # which it is by using ARCHITECTURE=. - # Guessing based on what os.uname() returns at least allows it - # to work for both i386 and x86_64 Linux systems. - archmap = { - 'i686' : 'i386', - 'i586' : 'i386', - 'i486' : 'i386', - } - - buildarchitecture = os.uname()[4] - buildarchitecture = archmap.get(buildarchitecture, buildarchitecture) + buildarchitecture = SCons.Tool.rpmutils.defaultMachine() if 'ARCHITECTURE' in kw: buildarchitecture = kw['ARCHITECTURE'] |