Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/python.sminc

    Diff of /trunk/include/python.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 33280 by niro, Mon Oct 21 10:06:01 2019 UTC revision 33281 by niro, Wed Oct 23 11:27:48 2019 UTC
    # Line 75  python_docompile() Line 75  python_docompile()
    75   ${MAGE_PYTHON_EXEC} waf build $@ || die   ${MAGE_PYTHON_EXEC} waf build $@ || die
    76   elif [[ -e meson.build ]]   elif [[ -e meson.build ]]
    77   then   then
    78   meson_configure -D python=${MAGE_PYTHON_EXEC} || die   # never run multilib builds here, multilib will be enabled by python_multilib_src_compile
    79   mninja || die   # this honors the logic of other build methods (python, waf, autotools)
    80     MULTILIB_BUILD=false meson_configure -D python=${MAGE_PYTHON_EXEC} || die
    81     MULTILIB_BUILD=false mninja || die
    82   elif [[ -e configure ]]   elif [[ -e configure ]]
    83   then   then
    84   if [[ ${MULTILIB_BUILD} = true ]] && [[ ! -z $(typeset -f oldmconfigure) ]]  && [[ ! -z $(typeset -f oldmmake) ]]   if [[ ${MULTILIB_BUILD} = true ]] && [[ ! -z $(typeset -f oldmconfigure) ]]  && [[ ! -z $(typeset -f oldmmake) ]]
    # Line 105  python_doinstall() Line 107  python_doinstall()
    107   ${MAGE_PYTHON_EXEC} waf install --destdir=${BINDIR} $@ || die   ${MAGE_PYTHON_EXEC} waf install --destdir=${BINDIR} $@ || die
    108   elif [[ -e meson.build ]]   elif [[ -e meson.build ]]
    109   then   then
    110   DESTDIR=${BINDIR} mninja install || die   # never run multilib builds here, multilib will be enabled by python_multilib_src_compile
    111     # this honors the logic of other build methods (python, waf, autotools)
    112     MULTILIB=false DESTDIR=${BINDIR} mninja install || die
    113   elif [[ -e install.py ]]   elif [[ -e install.py ]]
    114   then   then
    115   ${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die   ${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die
    Legend:
    Removed from v.33280  
    changed lines
      Added in v.33281