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

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

Parent Directory | Revision Log | View Patch Patch

-revision 11029 by niro,
Sat Feb 11 19:33:40 2012 UTC
+revision 21293 by niro,
Wed Jun 11 11:10:25 2014 UTC
 Line 1
  # $Id$
  # multilib abis
+ # tell the buildsystem that we are doing a multilib build
+ export MULTILIB_BUILD="true"
  # be verbose or nor (true|false}
  : ${MULTILIB_VERBOSE="true"}
  # multilib should call all dependant includes, which gets overridden
- sminclude mtools cmake
+ sminclude mtools
  # do not define EMUL_LINUX_32 after inherit of multlib !!
  # it may break i*86 builds
-Line 69 
 abi-m32()
+Line 72 
 abi-m32()
  	export ABI_LIBDIR="lib"
  	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
  	then
- 		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
+ 		local saved_ldflags="${LDFLAGS}"
+ 		export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
  	fi
  	# keep pkgconfig clean
  	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
-Line 88 
 abi-m32()
+Line 92 
 abi-m32()
  		else
  			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
  		fi
+ 		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+ 		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
  		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
  	fi
-Line 99 
 abi-m32()
+Line 105 
 abi-m32()
  			echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
  		fi
  		uname(){ linux32 uname $@; } && export -f uname
- 		ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"
+ 		local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
  	fi
  	if [[ ${MULTILIB_VERBOSE} = true ]]
  	then
-Line 109 
 abi-m32()
+Line 115 
 abi-m32()
  	# run any given command
  	eval $@ || die
- 	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+ 	unset ABI CC CXX ABI_LIBDIR
  	# keep pkgconfig clean
  	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+ 	export LDFLAGS="${saved_ldflags}"
  	# restore original settings
  	if [[ ${EMUL_LINUX_32} = true ]]
  	then
  		unset uname
- 		export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST
+ 		export CHOST="${orig_chost}" && unset orig_chost
  	fi
  }
-Line 129 
 abi-m64()
+Line 136 
 abi-m64()
  	export ABI_LIBDIR="lib64"
  	if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
  	then
+ 		local saved_ldflags="${LDFLAGS}"
  		export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
  	fi
  	# keep pkgconfig clean
-Line 149 
 abi-m64()
+Line 157 
 abi-m64()
  			echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
  		fi
  		echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
+ 		echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
  		echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
  	fi
  	# run any given command
  	eval $@ || die
- 	unset ABI CC CXX ABI_LIBDIR LDFLAGS
+ 	unset ABI CC CXX ABI_LIBDIR
  	# keep pkgconfig clean
  	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
+ 	export LDFLAGS="${saved_ldflags}"
  }
  only-m32()
-Line 172 
 only-m32()
+Line 182 
 only-m32()
  			# export this for mpatch etc (to repect only-${abi})
  			export MULTILIB_ONLY_ABI=${abi}
- 			cd ${SRCDIR}-${abi}
+ 			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  			abi-${abi} $@ || die
  			# unset this is very important
-Line 193 
 only-m64()
+Line 203 
 only-m64()
  			# export this for mpatch etc (to repect only-${abi})
  			export MULTILIB_ONLY_ABI=${abi}
- 			cd ${SRCDIR}-${abi}
+ 			cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  			abi-${abi} $@ || die
  			# unset this is very important
-Line 207 
 all-abis()
+Line 217 
 all-abis()
  	local abi
  	for abi in ${MULTILIB_ABIS}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		abi-${abi} $@ || die
  	done
  }
-Line 217 
 mabi()
+Line 227 
 mabi()
  	echo \${ABI}
  }
+ mabi-cc()
+ {
+ 	echo "gcc -\${ABI}"
+ }
+ mabi-cxx()
+ {
+ 	echo "g++ -\${ABI}"
+ }
+ mabi-cflags()
+ {
+ 	echo "\${CFLAGS}"
+ }
+ mabi-cxxflags()
+ {
+ 	echo "\${CXXFLAGS}"
+ }
+ mabi-ldflags()
+ {
+ 	echo "\${LDFLAGS}"
+ }
  ##
  # multilib compile functions
  ##
-Line 226 
 then
+Line 261 
 then
  	# rename the old one
  	old_mconfigure=old$(typeset -f mconfigure)
  	eval "${old_mconfigure}"
- fi
  mconfigure()
  {
  	local abi
-Line 237 
 mconfigure()
+Line 272 
 mconfigure()
  	for abi in ${abis_to_run}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		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 260 
 cmake_configure()
+Line 296 
 cmake_configure()
  	for abi in ${abis_to_run}
  	do
  		SRCDIR="${saved_SRCDIR}-${abi}"
- 		cd ${SRCDIR}
+ 		# 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}"
+ cmake_src_compile()
+ {
+ 	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
+ 		# remove build dir if exist
+ 		[[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
+ 		# build outside of the source dir
+ 		install -d ${BUILDDIR}/build-${abi} || die
+ 		cd ${BUILDDIR}/build-${abi}
+ 	done
+ 	cmake_configure || die
+ 	for abi in ${abis_to_run}
+ 	do
+ 		cd ${BUILDDIR}/build-${abi}
+ 		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}"
+ cmake_src_install()
+ {
+ 	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
+ 		# install build outside of the source dir
+ 		cd ${BUILDDIR}/build-${abi}
+ 		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 284 
 munpack()
+Line 406 
 munpack()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
- 		oldmunpack ${SRCFILE} || die
+ 		oldmunpack $@ || die
  		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 306 
 mmake()
+Line 429 
 mmake()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		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 328 
 minstall()
+Line 452 
 minstall()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		abi-${abi} oldminstall $@ || die
  	done
  }
+ fi
  minstall_destdir()
  {
-Line 344 
 minstall_destdir()
+Line 469 
 minstall_destdir()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		make DESTDIR=${BINDIR} $@ install || die
  	done
  }
-Line 354 
 then
+Line 479 
 then
  	# rename the old one
  	old_mpatch=old$(typeset -f mpatch)
  	eval "${old_mpatch}"
- fi
  mpatch()
  {
  	local abi
-Line 366 
 mpatch()
+Line 491 
 mpatch()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		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 388 
 mlibtoolize()
+Line 514 
 mlibtoolize()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		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 410 
 mautoreconf()
+Line 537 
 mautoreconf()
  	for abi in ${abis_to_run}
  	do
  		echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		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 433 
 minstalldocs()
+Line 561 
 minstalldocs()
  	for abi in ${abis_to_run}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		oldminstalldocs $@ || die
  	done
  }
+ fi
  ##
  # multilib mbuild wrappers
  ##
  multilib_src_prepare()
  {
- 	munpack
+ 	munpack ${SRCFILE} || die
  }
  multilib_src_compile()
  {
- 	mconfigure
+ 	if [[ ! -z $(typeset -f cmake_src_compile) ]]
- 	mmake
+ 	then
+ 		cmake_src_compile || die
+ 	else
+ 		mconfigure || die
+ 		mmake || die
+ 	fi
  }
  multilib_src_check()
  {
- 	mmake -j1 -k check || die
+ 	if [[ ! -z $(typeset -f cmake_src_check) ]]
+ 	then
+ 		cmake_src_check || die
+ 	else
+ 		mmake -j1 -k check || die
+ 	fi
  }
  multilib_src_install()
  {
- 	minstall_destdir
+ 	if [[ ! -z $(typeset -f cmake_src_install) ]]
+ 	then
+ 		cmake_src_install || die
+ 	else
+ 		mmake DESTDIR=${BINDIR} install || die
+ 	fi
  	local i
  	for abi in ${MULTILIB_ABIS}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
  			FAQ LICENSE NEWS README TODO
  		do

 Legend:



Removed from v.11029
 


changed lines


 
Added in v.21293
 Legend:



Removed from v.11029
 


changed lines


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