Magellan Linux

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 22297 by niro, Fri Sep 19 11:22:11 2014 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 365  cmake_src_check() Line 365  cmake_src_check()
365   then   then
366   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
367   else   else
368   cd ${SRCDIR}   cd ${SRCDIR}-${abi}
369   fi   fi
370   mmake -j1 -k check || die   mmake -j1 -k check || die
371   done   done
# Line 393  cmake_src_install() Line 393  cmake_src_install()
393   then   then
394   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
395   else   else
396   cd ${SRCDIR}   cd ${SRCDIR}-${abi}
397   fi   fi
398   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die   abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
399   done   done

Legend:
Removed from v.22066  
changed lines
  Added in v.22297