Magellan Linux

Diff of /trunk/include/multilib.sminc

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

revision 22067 by niro, Fri Aug 22 12:29:21 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 301  cmake_configure() Line 301  cmake_configure()
301   then   then
302   cd ${BUILDDIR}/build-${abi}   cd ${BUILDDIR}/build-${abi}
303   else   else
304   cd ${SRCDIR}-${abi}   cd ${SRCDIR}
305   fi   fi
306   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
307   done   done

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