Salome HOME
spns #32926: backport KERNEL & CONFIGURATION fixes on more recent platforms to ensure...
[tools/sat_salome.git] / products / patches / omniORB-4.2.5.p1.patch
1 diff -Naur omniORB-4.2.5_ref/configure omniORB-4.2.5_new/configure
2 --- omniORB-4.2.5_ref/configure 2021-11-21 12:54:32.000000000 +0100
3 +++ omniORB-4.2.5_new/configure 2022-08-24 15:31:58.859494037 +0200
4 @@ -4309,7 +4309,7 @@
5  if ${am_cv_python_version+:} false; then :
6    $as_echo_n "(cached) " >&6
7  else
8 -  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
9 +  am_cv_python_version=`$PYTHON -c "import sys,sysconfig; sys.stdout.write(sysconfig.get_python_version())"`
10  fi
11  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
12  $as_echo "$am_cv_python_version" >&6; }
13 @@ -4362,34 +4362,12 @@
14    $as_echo_n "(cached) " >&6
15  else
16    if test "x$prefix" = xNONE
17 -     then
18 -       am_py_prefix=$ac_default_prefix
19 -     else
20 -       am_py_prefix=$prefix
21 -     fi
22 -     am_cv_python_pythondir=`$PYTHON -c "
23 -$am_python_setup_sysconfig
24 -if can_use_sysconfig:
25 -    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
26 -else:
27 -    from distutils import sysconfig
28 -    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
29 -sys.stdout.write(sitedir)"`
30 -     case $am_cv_python_pythondir in
31 -     $am_py_prefix*)
32 -       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
33 -       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
34 -       ;;
35 -     *)
36 -       case $am_py_prefix in
37 -         /usr|/System*) ;;
38 -         *)
39 -         am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
40 -         ;;
41 -       esac
42 -       ;;
43 -     esac
44 -
45 +  then
46 +      am_py_prefix=$ac_default_prefix
47 +  else
48 +      am_py_prefix=$prefix
49 +  fi
50 +  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
51  fi
52  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
53  $as_echo "$am_cv_python_pythondir" >&6; }
54 @@ -4411,29 +4389,7 @@
55       else
56         am_py_exec_prefix=$exec_prefix
57       fi
58 -     am_cv_python_pyexecdir=`$PYTHON -c "
59 -$am_python_setup_sysconfig
60 -if can_use_sysconfig:
61 -    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
62 -else:
63 -    from distutils import sysconfig
64 -    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
65 -sys.stdout.write(sitedir)"`
66 -     case $am_cv_python_pyexecdir in
67 -     $am_py_exec_prefix*)
68 -       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
69 -       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
70 -       ;;
71 -     *)
72 -       case $am_py_exec_prefix in
73 -         /usr|/System*) ;;
74 -         *)
75 -          am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
76 -          ;;
77 -       esac
78 -       ;;
79 -     esac
80 -
81 +     am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
82  fi
83  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
84  $as_echo "$am_cv_python_pyexecdir" >&6; }