Magellan Linux

Diff of /trunk/include/pypi.sminc

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

revision 29841 by niro, Mon Oct 16 09:21:22 2017 UTC revision 29846 by niro, Mon Oct 16 09:52:30 2017 UTC
# Line 66  pypi_src_prepare() Line 66  pypi_src_prepare()
66   fi   fi
67  }  }
68    
69    pypi_multilib_src_prepare()
70    {
71     if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
72     then
73     python2_multilib_src_prepare || die
74     python3_multilib_src_prepare || die
75     else
76     python_multilib_src_prepare || die
77     fi
78    }
79    
80  pypi_src_compile()  pypi_src_compile()
81  {  {
82   local configure_opts="$@"   local configure_opts="$@"
# Line 79  pypi_src_compile() Line 90  pypi_src_compile()
90   fi   fi
91  }  }
92    
93    pypi_multilib_src_compile()
94    {
95     local configure_opts="$@"
96    
97     if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
98     then
99     python2_multilib_src_compile ${configure_opts} || die
100     python3_multilib_src_compile ${configure_opts} || die
101     else
102     python_multilib_src_compile ${configure_opts} || die
103     fi
104    }
105    
106  pypi_src_install()  pypi_src_install()
107  {  {
108   python_src_install || die   python_src_install || die
# Line 94  eval "pypi_src_install_python3-${SPLIT_P Line 118  eval "pypi_src_install_python3-${SPLIT_P
118   python3_src_install || die   python3_src_install || die
119  }"  }"
120    
 pypi_multilib_src_compile()  
 {  
  local configure_opts="$@"  
  python_multilib_src_compile ${configure_opts} || die  
   
 }  
   
 pypi_multilib_python2_src_compile()  
 {  
  local configure_opts="$@"  
   
  if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]  
  then  
  python2_multilib_src_compile ${configure_opts} || die  
  python3_multilib_src_compile ${configure_opts} || die  
  else  
  python_multilib_src_compile ${configure_opts} || die  
  fi  
 }  
   
121  pypi_multilib_src_install()  pypi_multilib_src_install()
122  {  {
123   python_multilib_src_install || die   python_multilib_src_install || die
# Line 129  eval "pypi_multilib_src_install_python3- Line 133  eval "pypi_multilib_src_install_python3-
133   python3_multilib_src_install || die   python3_multilib_src_install || die
134  }"  }"
135    
 export_inherits pypi src_prepare  
136  if [[ ${MULTILIB_BUILD} = true ]]  if [[ ${MULTILIB_BUILD} = true ]]
137  then  then
138   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
139   then   then
140   export_inherits pypi_multilib src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}   export_inherits pypi_multilib src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
141   else   else
142   export_inherits pypi_multilib src_compile src_install   export_inherits pypi_multilib src_prepare src_compile src_install
143   fi   fi
144  else  else
145   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
146   then   then
147   export_inherits pypi src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}   export_inherits pypi src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
148   else   else
149   export_inherits pypi src_compile src_install   export_inherits pypi src_prepare src_compile src_install
150   fi   fi
151  fi  fi

Legend:
Removed from v.29841  
changed lines
  Added in v.29846