Ticket #13252: mythplugins-configure-mythroot-20180518.patch

File mythplugins-configure-mythroot-20180518.patch, 1.4 KB (added by mspieth, 2 years ago)
  • mythplugins/configure

    diff --git a/mythplugins/configure b/mythplugins/configure
    index 941d15de8e..8195d1d997 100755
    a b check_py_lib(){ 
    477477    check_cmd $python <<EOF
    478478from distutils.sysconfig import get_python_lib
    479479import sys
    480 sys.path.append(get_python_lib(prefix='${prefix}'))
     480for mythroot in '${mythroot}'.split(':'):
     481    sys.path.append(get_python_lib(prefix=mythroot +'${prefix}'))
     482sys.path.append(get_python_lib(prefix='${sysroot}${prefix}'))
    481483try:
    482484    import $lib
    483485except:
    EOF 
    537539fi
    538540
    539541# bring in mythtv config
    540 if [ -e $mythroot$prefix/include/mythtv/mythconfig.mak ] ; then
     542mythrootlist=$(echo "$mythroot" | tr ":" " ")
     543for mythrootitem in $mythrootlist; do
     544    if [ -e $mythrootitem$prefix/include/mythtv/mythconfig.mak ] ; then
     545        break;
     546    fi
     547done
     548if [ -e $mythrootitem$prefix/include/mythtv/mythconfig.mak ] ; then
    541549    rm mythconfig.mak 2> /dev/null
    542     cp $mythroot$prefix/include/mythtv/mythconfig.mak mythconfig.mak
    543     sed -i -e "s,^SYSROOT\=.*,SYSROOT=$mythroot,g" mythconfig.mak
     550    cp $mythrootitem$prefix/include/mythtv/mythconfig.mak mythconfig.mak
     551    sed -i -e "s,^SYSROOT\=.*,SYSROOT=$mythrootitem,g" mythconfig.mak
    544552elif [ -e $prefix/include/mythtv/mythconfig.mak ] ; then
    545553    rm mythconfig.mak 2> /dev/null
    546554    ${ln_s} $prefix/include/mythtv/mythconfig.mak mythconfig.mak