package/develop/scons/ranlib-ar.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../scons/ranlib-ar.patch
   5 # Copyright (C) 2020 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- SCons-4.0.1/SCons/Tool/ar.py.vanilla        2020-09-15 18:33:59.696519625 +0200
  18 +++ SCons-4.0.1/SCons/Tool/ar.py        2020-09-15 18:36:47.284521972 +0200
  19 @@ -36,5 +36,5 @@
  20  import SCons.Defaults
  21  import SCons.Tool
  22  import SCons.Util
  23 -
  24 +import os
  25
  26 @@ -42,14 +42,14 @@
  27      """Add Builders and construction variables for ar to an Environment."""
  28      SCons.Tool.createStaticLibBuilder(env)
  29
  30 -    env['AR']          = 'ar'
  31 +    env['AR']          = os.getenv('AR') or 'ar'
  32      env['ARFLAGS']     = SCons.Util.CLVar('rc')
  33      env['ARCOM']       = '$AR $ARFLAGS $TARGET $SOURCES'
  34      env['LIBPREFIX']   = 'lib'
  35      env['LIBSUFFIX']   = '.a'
  36
  37 -    if env.get('RANLIB',env.Detect('ranlib')) :
  38 -        env['RANLIB']      = env.get('RANLIB','ranlib')
  39 +    if env.get('RANLIB',os.getenv('RANLIB')) or env.Detect('ranlib') :
  40 +        env['RANLIB']      = env.get('RANLIB',os.getenv('RANLIB')) or 'ranlib'
  41          env['RANLIBFLAGS'] = SCons.Util.CLVar('')
  42          env['RANLIBCOM']   = '$RANLIB $RANLIBFLAGS $TARGET'
  43