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

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

Parent Directory | Revision Log | View Patch Patch

-revision 20977 by niro,
Wed Feb 19 11:32:53 2014 UTC
+revision 21293 by niro,
Wed Jun 11 11:10:25 2014 UTC
 Line 261 
 then
  	# rename the old one
  	old_mconfigure=old$(typeset -f mconfigure)
  	eval "${old_mconfigure}"
- fi
  mconfigure()
  {
  	local abi
 Line 276 
 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 295 
 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 342 
 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}"
+ cmake_src_check()
+ {
+ 	local abi
+ 	local abis_to_run="${MULTILIB_ABIS}"
+ 	# respect MULTILIB_ONLY_ABI variable
+ 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+ 	for abi in ${abis_to_run}
+ 	do
+ 		cd ${BUILDDIR}/build-${abi}
+ 		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 356 
 cmake_src_install()
+Line 387 
 cmake_src_install()
  		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 378 
 munpack()
+Line 410 
 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 400 
 mmake()
+Line 433 
 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 422 
 minstall()
+Line 456 
 minstall()
  		abi-${abi} oldminstall $@ || die
  	done
  }
+ fi
  minstall_destdir()
  {
-Line 444 
 then
+Line 479 
 then
  	# rename the old one
  	old_mpatch=old$(typeset -f mpatch)
  	eval "${old_mpatch}"
- fi
  mpatch()
  {
  	local abi
-Line 460 
 mpatch()
+Line 495 
 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 482 
 mlibtoolize()
+Line 518 
 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 504 
 mautoreconf()
+Line 541 
 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 527 
 minstalldocs()
+Line 565 
 minstalldocs()
  		oldminstalldocs $@ || die
  	done
  }
+ fi
  ##
  # multilib mbuild wrappers
-Line 561 
 multilib_src_install()
+Line 600 
 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.20977
 


changed lines


 
Added in v.21293
 Legend:



Removed from v.20977
 


changed lines


 
Added in v.21293
-Removed from v.20977
+Added in v.21293