diff options
| -rw-r--r-- | changes/bug_lib64-path-fix-for-bootstrap-script | 1 | ||||
| -rwxr-xr-x | pkg/postmkvenv.sh | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/changes/bug_lib64-path-fix-for-bootstrap-script b/changes/bug_lib64-path-fix-for-bootstrap-script new file mode 100644 index 00000000..4e4400c1 --- /dev/null +++ b/changes/bug_lib64-path-fix-for-bootstrap-script @@ -0,0 +1 @@ +- Bugfix: Fix the bootstrap script for developers so it works on Fedora/RHEL systems where there is /usr/lib64 for python libs. diff --git a/pkg/postmkvenv.sh b/pkg/postmkvenv.sh index 7b06fa6d..015464d3 100755 --- a/pkg/postmkvenv.sh +++ b/pkg/postmkvenv.sh @@ -21,16 +21,18 @@ LIBS=( PySide pysideuic ) PYTHON_VERSION=python$(python -c "import sys; print (str(sys.version_info[0])+'.'+str(sys.version_info[1]))") VAR=( $(which -a $PYTHON_VERSION) ) -GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib())" +# this takes care of the /usr/lib vs /usr/lib64 differences between platforms +GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib(plat_specific=True))" + LIB_VIRTUALENV_PATH=$(python -c "$GET_PYTHON_LIB_CMD") if [[ $platform == 'linux' ]]; then LIB_SYSTEM_PATH=$(${VAR[-1]} -c "$GET_PYTHON_LIB_CMD") elif [[ $platform == 'darwin' ]]; then ORIGINAL_PATH=$PATH - #change first colon of path to | because path substitution is greedy + # change first colon of path to | because path substitution is greedy PATH=${PATH/:/|} - #remove everything up to | from path + # remove everything up to | from path PATH=${PATH/*|/} LIB_SYSTEM_PATH=$(python -c "$GET_PYTHON_LIB_CMD") PATH=$ORIGINAL_PATH |