Magellan Linux

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

    Diff of /trunk/include/multilib.sminc

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

    revision 22066 by niro, Fri Aug 22 12:04:19 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 365  cmake_src_check() Line 373  cmake_src_check()
    373   then   then
    374   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
    375   else   else
    376   cd ${SRCDIR}   cd ${SRCDIR}-${abi}
    377   fi   fi
    378   mmake -j1 -k check || die   mmake -j1 -k check || die
    379   done   done
    # Line 393  cmake_src_install() Line 401  cmake_src_install()
    401   then   then
    402   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
    403   else   else
    404   cd ${SRCDIR}   cd ${SRCDIR}-${abi}
    405   fi   fi
    406   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    407   done   done
    Legend:
    Removed from v.22066  
    changed lines
      Added in v.29795