Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/multilib.sminc

    Diff of /branches/R11-unstable/include/multilib.sminc

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

    revision 20987 by niro, Mon Mar 3 09:56:03 2014 UTC revision 29795 by niro, Thu Oct 12 11:55:58 2017 UTC
    # Line 42  then Line 42  then
    42   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    43   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    44   then   then
    45   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
    46   else   else
    47   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    48   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    49   fi   fi
    50  fi  fi
    51    
    # Line 113  abi-m32() Line 113  abi-m32()
    113   fi   fi
    114    
    115   # run any given command   # run any given command
    116     if [[ ${MULTILIB_VERBOSE} = true ]]
    117     then
    118     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    119     fi
    120   eval $@ || die   eval $@ || die
    121    
    122   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 162  abi-m64() Line 166  abi-m64()
    166   fi   fi
    167    
    168   # run any given command   # run any given command
    169     if [[ ${MULTILIB_VERBOSE} = true ]]
    170     then
    171     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    172     fi
    173   eval $@ || die   eval $@ || die
    174    
    175   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 295  cmake_configure() Line 303  cmake_configure()
    303   local saved_SRCDIR="${SRCDIR}"   local saved_SRCDIR="${SRCDIR}"
    304   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    305   do   do
      cd ${BUILDDIR}/build-${abi}  
    306   SRCDIR="${saved_SRCDIR}-${abi}"   SRCDIR="${saved_SRCDIR}-${abi}"
    307     # honor inside and outside build-dir builds
    308     if [ -d ${BUILDDIR}/build-${abi} ]
    309     then
    310     cd ${BUILDDIR}/build-${abi}
    311     else
    312     cd ${SRCDIR}
    313     fi
    314   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    315   done   done
    316   # restore SRCDIR   # restore SRCDIR
    # Line 354  cmake_src_check() Line 368  cmake_src_check()
    368    
    369   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    370   do   do
    371   cd ${BUILDDIR}/build-${abi}   # honor inside and outside build-dir builds
    372     if [ -d ${BUILDDIR}/build-${abi} ]
    373     then
    374     cd ${BUILDDIR}/build-${abi}
    375     else
    376     cd ${SRCDIR}-${abi}
    377     fi
    378   mmake -j1 -k check || die   mmake -j1 -k check || die
    379   done   done
    380  }  }
    # Line 376  cmake_src_install() Line 396  cmake_src_install()
    396    
    397   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    398   do   do
    399   # install build outside of the source dir   # honor inside and outside build-dir builds
    400   cd ${BUILDDIR}/build-${abi}   if [ -d ${BUILDDIR}/build-${abi} ]
    401     then
    402     cd ${BUILDDIR}/build-${abi}
    403     else
    404     cd ${SRCDIR}-${abi}
    405     fi
    406   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    407   done   done
    408  }  }
    Legend:
    Removed from v.20987  
    changed lines
      Added in v.29795