gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From 973767f29391eca1c76292556de03cdd7520c07d Mon Sep 17 00:00:00 2001
   2 From: Erik Boto <erik.boto@gmail.com>
   3 Date: Tue, 3 Nov 2020 09:08:56 -0700
   4 Subject: [PATCH] Allow passing flags via FARCH for mach
   5
   6 Enable passing options via FARCH, so that the flags for setting the
   7 correct floating point ABI is propagated properly to the fortran
   8 compiler.
   9
  10 This fixes an issue where the mach lib would otherwise be built as
  11 soft-float, even though the target arch is hard-float.
  12 ---
  13  scipy/integrate/setup.py | 3 +--
  14  scipy/special/setup.py   | 3 +--
  15  2 files changed, 2 insertions(+), 4 deletions(-)
  16
  17 diff --git a/scipy/integrate/setup.py b/scipy/integrate/setup.py
  18 index 11ce3d1..8e4a3dc 100755
  19 --- a/scipy/integrate/setup.py
  20 +++ b/scipy/integrate/setup.py
  21 @@ -34,8 +34,7 @@ def configuration(parent_package='',top_path=None):
  22      quadpack_test_src = [join('tests','_test_multivariate.c')]
  23      odeint_banded_test_src = [join('tests', 'banded5x5.f')]
  24
  25 -    config.add_library('mach', sources=mach_src, config_fc={'noopt': (__file__, 1)},
  26 -                       _pre_build_hook=pre_build_hook)
  27 +    config.add_library('mach', sources=mach_src, _pre_build_hook=pre_build_hook)
  28      config.add_library('quadpack', sources=quadpack_src, _pre_build_hook=pre_build_hook)
  29      config.add_library('lsoda', sources=lsoda_src, _pre_build_hook=pre_build_hook)
  30      config.add_library('vode', sources=vode_src, _pre_build_hook=pre_build_hook)
  31 diff --git a/scipy/special/setup.py b/scipy/special/setup.py
  32 index 81eb09f..260cfb3 100755
  33 --- a/scipy/special/setup.py
  34 +++ b/scipy/special/setup.py
  35 @@ -46,8 +46,7 @@ def configuration(parent_package='',top_path=None):
  36      amos_src = [join('amos','*.f')]
  37      cdf_src = [join('cdflib','*.f')]
  38      specfun_src = [join('specfun','*.f')]
  39 -    config.add_library('sc_mach',sources=mach_src,
  40 -                       config_fc={'noopt':(__file__,1)})
  41 +    config.add_library('sc_mach',sources=mach_src)
  42      config.add_library('sc_amos',sources=amos_src)
  43      config.add_library('sc_cdf',sources=cdf_src)
  44      config.add_library('sc_specfun',sources=specfun_src)