Magellan Linux

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

    Diff of /trunk/include/cmake.sminc

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

    revision 29992 by niro, Fri Oct 20 06:34:55 2017 UTC revision 30125 by niro, Fri Oct 27 08:58:33 2017 UTC
    # Line 141  cmake_configure() Line 141  cmake_configure()
    141   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"   default_opts+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
    142   default_opts+=" -DCMAKE_BUILD_TYPE=Release"   default_opts+=" -DCMAKE_BUILD_TYPE=Release"
    143   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
    144   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'   if [[ ${MULTILIB_BUILD} = true ]]
    145   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'   then
    146     # eval these variables later with the abi-${ABI} caller
    147     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
    148     default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
    149     default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
    150     else
    151     # eval these variables now
    152     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
    153     default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"
    154     default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
    155     fi
    156    
    157   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    158   then   then
    # Line 172  cmake_setup_builddir() Line 182  cmake_setup_builddir()
    182   fi   fi
    183  }  }
    184    
    185    cmake_mmake()
    186    {
    187     if [[ ${MULTILIB_BUILD} = true ]]
    188     then
    189     mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die
    190     else
    191     mmake -C ${BUILDDIR}/build "$@" || die
    192     fi
    193    }
    194    
    195  cmake_src_compile()  cmake_src_compile()
    196  {  {
    197   cd ${SRCDIR}   cd ${SRCDIR}
    198    
    199   cmake_setup_builddir || die   cmake_setup_builddir || die
    200   cmake_configure "$@" || die   cmake_configure "$@" || die
    201   mmake -C ${BUILDDIR}/build-$(mabi) || die   cmake_mmake || die
    202  }  }
    203    
    204  cmake_src_check()  cmake_src_check()
    # Line 205  cmake_multilib_src_check() Line 225  cmake_multilib_src_check()
    225    
    226  cmake_src_install()  cmake_src_install()
    227  {  {
    228   cd ${BUILDDIR}/build   cmake_mmake DESTDIR=${BINDIR} install || die
      make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
    229    
    230   cd ${SRCDIR}   cd ${SRCDIR}
    231   local i   local i
    # Line 224  cmake_multilib_src_install() Line 243  cmake_multilib_src_install()
    243  {  {
    244   local abi   local abi
    245   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    246    
    247     cmake_mmake DESTDIR=${BINDIR} install || die
    248    
    249   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    250   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    251   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    252   do   do
      cd ${BUILDDIR}/build-${abi}  
      abi-${abi} make ${MAKEOPTS} DESTDIR=${BINDIR} install || die  
       
    253   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    254   local i   local i
    255   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    Legend:
    Removed from v.29992  
    changed lines
      Added in v.30125