Magellan Linux

Diff of /trunk/include/cmake.sminc

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

revision 29889 by niro, Tue Oct 17 13:53:59 2017 UTC revision 30002 by niro, Fri Oct 20 08:24:46 2017 UTC
# Line 172  cmake_setup_builddir() Line 172  cmake_setup_builddir()
172   fi   fi
173  }  }
174    
175    cmake_mmake()
176    {
177     if [[ ${MULTILIB_BUILD} = true ]]
178     then
179     mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die
180     else
181     mmake -C ${BUILDDIR}/build "$@" || die
182     fi
183    }
184    
185  cmake_src_compile()  cmake_src_compile()
186  {  {
187   cd ${SRCDIR}   cd ${SRCDIR}
188    
189   cmake_setup_builddir || die   cmake_setup_builddir || die
190   cmake_configure || die   cmake_configure "$@" || die
191   mmake || die   cmake_mmake || die
192  }  }
193    
194  cmake_src_check()  cmake_src_check()
# Line 205  cmake_multilib_src_check() Line 215  cmake_multilib_src_check()
215    
216  cmake_src_install()  cmake_src_install()
217  {  {
218   cd ${BUILDDIR}/build   cmake_mmake DESTDIR=${BINDIR} install || die
  make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
219    
220   cd ${SRCDIR}   cd ${SRCDIR}
221   local i   local i
# Line 224  cmake_multilib_src_install() Line 233  cmake_multilib_src_install()
233  {  {
234   local abi   local abi
235   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
236    
237     cmake_mmake DESTDIR=${BINDIR} install || die
238    
239   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
240   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
241   for abi in ${abis_to_run}   for abi in ${abis_to_run}
242   do   do
  cd ${BUILDDIR}/build-${abi}  
  make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
   
243   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
244   local i   local i
245   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \

Legend:
Removed from v.29889  
changed lines
  Added in v.30002