Magellan Linux

Diff of /trunk/include/python.sminc

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

revision 29782 by niro, Wed Oct 11 11:03:03 2017 UTC revision 29819 by niro, Fri Oct 13 08:33:10 2017 UTC
# Line 8  then Line 8  then
8   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
9   >= dev-lang/python-2.7"   >= dev-lang/python-2.7"
10  fi  fi
 if [[ -z ${MAGE_PYTHON_BUILD_VERSIONS} ]]  
 then  
  MAGE_PYTHON_BUILD_VERSIONS="single"  
 fi  
11    
12  # get the major.minor current installed python version  # get the major.minor current installed python version
13  # -> ex 2.4  # -> ex 2.4
# Line 19  mget-python-version() Line 15  mget-python-version()
15  {  {
16   local pyver   local pyver
17  # pyver="$(${MAGE_PYTHON_EXEC} -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"  # pyver="$(${MAGE_PYTHON_EXEC} -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"
18   pyver=$(${MAGE_PYTHON_EXEC} -c "import sys ; (print sys.version[:3])")   pyver=$(${MAGE_PYTHON_EXEC} -c "import sys ; print (sys.version[:3])")
19   [[ -z ${pyver} ]] && return 1   [[ -z ${pyver} ]] && return 1
20   echo "${pyver}"   echo "${pyver}"
21   return 0   return 0
# Line 76  python_docompile() Line 72  python_docompile()
72   ${MAGE_PYTHON_EXEC} waf build $@ || die   ${MAGE_PYTHON_EXEC} waf build $@ || die
73   elif [[ -e configure ]]   elif [[ -e configure ]]
74   then   then
75   mconfigure $@ || die   if [[ ${MULTILIB_BUILD} = true ]] && [[ ! -z $(typeset -f oldmconfigure) ]]  && [[ ! -z $(typeset -f oldmmake) ]]
76   mmake || die   then
77     oldmconfigure $@ || die
78     oldmmake || die
79     else
80     mconfigure $@ || die
81     mmake || die
82     fi
83   elif [[ -e install.py ]]   elif [[ -e install.py ]]
84   then   then
85   echo "install.py found - nothing to compile here."   echo "install.py found - nothing to compile here."
# Line 98  python_doinstall() Line 100  python_doinstall()
100   then   then
101   ${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die   ${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die
102   else   else
103   mmake DESTDIR=${BINDIR} install || die   if [[ ${MULTILIB_BUILD} = true ]] && [[ ! -z $(typeset -f oldmconfigure) ]]  && [[ ! -z $(typeset -f oldmmake) ]]
104     then
105     oldmmake DESTDIR=${BINDIR} install || die
106     else
107     mmake DESTDIR=${BINDIR} install || die
108     fi
109   fi   fi
110  }  }
111    

Legend:
Removed from v.29782  
changed lines
  Added in v.29819