pkgs/by-name/li/lib25519/environment-variable-tools.patch

   1 diff --git a/configure b/configure
   2 index 04042b2..30d1ea9 100755
   3 --- a/configure
   4 +++ b/configure
   5 @@ -210,6 +210,17 @@ for arch in sorted(os.listdir('compilers')):
   6      with open('compilers/%s' % arch) as f:
   7        for c in f.readlines():
   8          c = c.strip()
   9 +        if env_cc := os.getenv('CC'):
  10 +          c_as_list= c.split()
  11 +          # check if the compiler we're testing has the name inside the last
  12 +          # part of the CC env var
  13 +          # i.e. gcc == x86_64-linux-unknown-gnu-gcc
  14 +          # or gcc == gcc
  15 +          if c_as_list[0] == env_cc.split("-")[-1]:
  16 +            c_as_list[0] = env_cc
  17 +          c = ' '.join(c_as_list)
  18 +          log('patched command as %s' % c)
  19 +
  20          cv = compilerversion(c)
  21          if cv == None:
  22            log('skipping %s compiler %s' % (arch,c))
  23 diff --git a/scripts-build/checknamespace b/scripts-build/checknamespace
  24 index ae11bed..bd9cb85 100755
  25 --- a/scripts-build/checknamespace
  26 +++ b/scripts-build/checknamespace
  27 @@ -36,7 +36,7 @@ def doit(d):
  28    obj2U = {}
  29
  30    try:
  31 -    p = subprocess.Popen(['nm','-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True)
  32 +    p = subprocess.Popen([os.getenv('NM', 'nm'),'-ApP']+objs,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,universal_newlines=True)
  33      out,err = p.communicate()
  34    except Exception as e:
  35      warn('nm failure: %s' % e)
  36 diff --git a/scripts-build/staticlib b/scripts-build/staticlib
  37 index 7683233..0445bc3 100755
  38 --- a/scripts-build/staticlib
  39 +++ b/scripts-build/staticlib
  40 @@ -3,6 +3,6 @@
  41  lib="$1"
  42
  43  rm -f package/lib/"$lib".a
  44 -ar cr package/lib/"$lib".a ofiles/*.o
  45 -ranlib package/lib/"$lib".a || :
  46 +${AR:-ar} cr package/lib/"$lib".a ofiles/*.o
  47 +${RANLIB:-ranlib} package/lib/"$lib".a || :
  48  chmod 644 package/lib/"$lib".a