Salome HOME
merge from master
[tools/sat_salome.git] / products / patches / omniORBpy-4.2.5.p1.patch
1 diff -Naur omniORBpy-4.2.5_ref/configure omniORBpy-4.2.5_new/configure
2 --- omniORBpy-4.2.5_ref/configure       2021-11-21 12:54:32.000000000 +0100
3 +++ omniORBpy-4.2.5_new/configure       2022-08-24 15:32:41.165692192 +0200
4 @@ -3515,7 +3515,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 @@ -3573,29 +3573,7 @@
14       else
15         am_py_prefix=$prefix
16       fi
17 -     am_cv_python_pythondir=`$PYTHON -c "
18 -$am_python_setup_sysconfig
19 -if can_use_sysconfig:
20 -    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
21 -else:
22 -    from distutils import sysconfig
23 -    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
24 -sys.stdout.write(sitedir)"`
25 -     case $am_cv_python_pythondir in
26 -     $am_py_prefix*)
27 -       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
28 -       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
29 -       ;;
30 -     *)
31 -       case $am_py_prefix in
32 -         /usr|/System*) ;;
33 -         *)
34 -         am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
35 -         ;;
36 -       esac
37 -       ;;
38 -     esac
39 -
40 +     am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
41  fi
42  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
43  $as_echo "$am_cv_python_pythondir" >&6; }
44 @@ -3617,29 +3595,7 @@
45       else
46         am_py_exec_prefix=$exec_prefix
47       fi
48 -     am_cv_python_pyexecdir=`$PYTHON -c "
49 -$am_python_setup_sysconfig
50 -if can_use_sysconfig:
51 -    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
52 -else:
53 -    from distutils import sysconfig
54 -    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
55 -sys.stdout.write(sitedir)"`
56 -     case $am_cv_python_pyexecdir in
57 -     $am_py_exec_prefix*)
58 -       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
59 -       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
60 -       ;;
61 -     *)
62 -       case $am_py_exec_prefix in
63 -         /usr|/System*) ;;
64 -         *)
65 -          am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
66 -          ;;
67 -       esac
68 -       ;;
69 -     esac
70 -
71 +     am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
72  fi
73  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
74  $as_echo "$am_cv_python_pyexecdir" >&6; }