/[smage]/branches/R11-unstable/include/multilib.sminc

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

Parent Directory | Revision Log | View Patch Patch

-revision 20978 by niro,
Wed Feb 19 12:10:12 2014 UTC
+revision 29795 by niro,
Thu Oct 12 11:55:58 2017 UTC
 Line 42 
 then
  	# the var ist decided with our common eval+echo magic
  	if [[ -z ${SDEPEND} ]]
  	then
- 		SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+ 		SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
  	else
  		SDEPEND="${SDEPEND}
- 			\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+ 			$(marchsdepend EMUL_LINUX_32_SDEPEND)"
  	fi
  fi
 Line 113 
 abi-m32()
  	fi
  	# run any given command
+ 	if [[ ${MULTILIB_VERBOSE} = true ]]
+ 	then
+ 		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+ 	fi
  	eval $@ || die
  	unset ABI CC CXX ABI_LIBDIR
-Line 162 
 abi-m64()
+Line 166 
 abi-m64()
  	fi
  	# run any given command
+ 	if [[ ${MULTILIB_VERBOSE} = true ]]
+ 	then
+ 		echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
+ 	fi
  	eval $@ || die
  	unset ABI CC CXX ABI_LIBDIR
-Line 261 
 then
+Line 269 
 then
  	# rename the old one
  	old_mconfigure=old$(typeset -f mconfigure)
  	eval "${old_mconfigure}"
- fi
  mconfigure()
  {
  	local abi
-Line 276 
 mconfigure()
+Line 284 
 mconfigure()
  		abi-${abi} oldmconfigure $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f cmake_configure) ]]
  then
  	# rename the old one
  	old_cmake_configure=old$(typeset -f cmake_configure)
  	eval "${old_cmake_configure}"
- fi
  cmake_configure()
  {
  	local abi
-Line 294 
 cmake_configure()
+Line 303 
 cmake_configure()
  	local saved_SRCDIR="${SRCDIR}"
  	for abi in ${abis_to_run}
  	do
- 		cd ${BUILDDIR}/build-${abi}
  		SRCDIR="${saved_SRCDIR}-${abi}"
+ 		# honor inside and outside build-dir builds
+ 		if [ -d ${BUILDDIR}/build-${abi} ]
+ 		then
+ 			cd ${BUILDDIR}/build-${abi}
+ 		else
+ 			cd ${SRCDIR}
+ 		fi
  		abi-${abi} oldcmake_configure $@ || die
  	done
  	# restore SRCDIR
  	SRCDIR="${saved_SRCDIR}"
  }
+ fi
  if [[ ! -z $(typeset -f cmake_src_compile) ]]
  then
  	# rename the old one
  	old_cmake_src_compile=old$(typeset -f cmake_src_compile)
  	eval "${old_cmake_src_compile}"
- fi
  cmake_src_compile()
  {
  	local abi
-Line 334 
 cmake_src_compile()
+Line 350 
 cmake_src_compile()
  		abi-${abi} oldmmake $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f cmake_src_check) ]]
  then
  	# rename the old one
  	old_cmake_src_check=old$(typeset -f cmake_src_check)
  	eval "${old_cmake_check}"
- fi
  cmake_src_check()
  {
  	local abi
-Line 351 
 cmake_src_check()
+Line 368 
 cmake_src_check()
  	for abi in ${abis_to_run}
  	do
- 		cd ${BUILDDIR}/build-${abi}
+ 		# honor inside and outside build-dir builds
+ 		if [ -d ${BUILDDIR}/build-${abi} ]
+ 		then
+ 			cd ${BUILDDIR}/build-${abi}
+ 		else
+ 			cd ${SRCDIR}-${abi}
+ 		fi
  		mmake -j1 -k check || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f cmake_src_install) ]]
  then
  	# rename the old one
  	old_cmake_src_install=old$(typeset -f cmake_src_install)
  	eval "${old_cmake_install}"
- fi
  cmake_src_install()
  {
  	local abi
-Line 372 
 cmake_src_install()
+Line 396 
 cmake_src_install()
  	for abi in ${abis_to_run}
  	do
- 		# install build outside of the source dir
+ 		# honor inside and outside build-dir builds
- 		cd ${BUILDDIR}/build-${abi}
+ 		if [ -d ${BUILDDIR}/build-${abi} ]
+ 		then
+ 			cd ${BUILDDIR}/build-${abi}
+ 		else
+ 			cd ${SRCDIR}-${abi}
+ 		fi
  		abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f munpack) ]]
  then
  	# rename the old one
  	old_munpack=old$(typeset -f munpack)
  	eval "${old_munpack}"
- fi
  munpack()
  {
  	local abi
-Line 399 
 munpack()
+Line 429 
 munpack()
  		mv ${SRCDIR} ${SRCDIR}-${abi} || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f mmake) ]]
  then
  	# rename the old one
  	old_mmake=old$(typeset -f mmake)
  	eval "${old_mmake}"
- fi
  mmake()
  {
  	local abi
-Line 421 
 mmake()
+Line 452 
 mmake()
  		abi-${abi} oldmmake $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f minstall) ]]
  then
  	# rename the old one
  	old_minstall=old$(typeset -f minstall)
  	eval "${old_minstall}"
- fi
  minstall()
  {
  	local abi
-Line 443 
 minstall()
+Line 475 
 minstall()
  		abi-${abi} oldminstall $@ || die
  	done
  }
+ fi
  minstall_destdir()
  {
-Line 465 
 then
+Line 498 
 then
  	# rename the old one
  	old_mpatch=old$(typeset -f mpatch)
  	eval "${old_mpatch}"
- fi
  mpatch()
  {
  	local abi
-Line 481 
 mpatch()
+Line 514 
 mpatch()
  		oldmpatch $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f mlibtoolize) ]]
  then
  	# rename the old one
  	old_mlibtoolize=old$(typeset -f mlibtoolize)
  	eval "${old_mlibtoolize}"
- fi
  mlibtoolize()
  {
  	local abi
-Line 503 
 mlibtoolize()
+Line 537 
 mlibtoolize()
  		oldmlibtoolize $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f mautoreconf) ]]
  then
  	# rename the old one
  	old_mautoreconf=old$(typeset -f mautoreconf)
  	eval "${old_mautoreconf}"
- fi
  mautoreconf()
  {
  	local abi
-Line 525 
 mautoreconf()
+Line 560 
 mautoreconf()
  		oldmautoreconf $@ || die
  	done
  }
+ fi
  if [[ ! -z $(typeset -f minstalldocs) ]]
  then
  	# rename the old one
  	old_minstalldocs=old$(typeset -f minstalldocs)
  	eval "${old_minstalldocs}"
- fi
  minstalldocs()
  {
  	local abi
-Line 548 
 minstalldocs()
+Line 584 
 minstalldocs()
  		oldminstalldocs $@ || die
  	done
  }
+ fi
  ##
  # multilib mbuild wrappers
-Line 582 
 multilib_src_install()
+Line 619 
 multilib_src_install()
  {
  	if [[ ! -z $(typeset -f cmake_src_install) ]]
  	then
- 		cmake_src_compile || die
+ 		cmake_src_install || die
  	else
  		mmake DESTDIR=${BINDIR} install || die
  	fi

 Legend:



Removed from v.20978
 


changed lines


 
Added in v.29795
 Legend:



Removed from v.20978
 


changed lines


 
Added in v.29795
-Removed from v.20978
+Added in v.29795