Diff of /smage/branches/alx07x-unstable/include/multilib.sminc

Parent Directory | Revision Log | Patch

	revision 5711 by niro, Thu Jul 3 13:54:17 2014 UTC	revision 5869 by niro, Fri Oct 17 08:03:03 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 360  cmake_src_check()	Line 360  cmake_src_check()
360
361	for abi in ${abis_to_run}	for abi in ${abis_to_run}
362	do	do
363	cd ${BUILDDIR}/build-${abi}	# honor inside and outside build-dir builds
364		if [ -d ${BUILDDIR}/build-${abi} ]
365		then
366		cd ${BUILDDIR}/build-${abi}
367		else
368		cd ${SRCDIR}-${abi}
369		fi
370	mmake -j1 -k check || die	mmake -j1 -k check || die
371	done	done
372	}	}
#	Line 382  cmake_src_install()	Line 388  cmake_src_install()
388
389	for abi in ${abis_to_run}	for abi in ${abis_to_run}
390	do	do
391	# install build outside of the source dir	# honor inside and outside build-dir builds
392	cd ${BUILDDIR}/build-${abi}	if [ -d ${BUILDDIR}/build-${abi} ]
393		then
394		cd ${BUILDDIR}/build-${abi}
395		else
396		cd ${SRCDIR}-${abi}
397		fi
398	abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die	abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
399	done	done
400	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.5711   changed lines   Added in v.5869