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

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

Parent Directory | Revision Log | View Patch Patch

-revision 9880 by niro,
Sat Jan 14 01:48:34 2012 UTC
+revision 11547 by niro,
Mon Mar 12 21:05:18 2012 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
  # do not define EMUL_LINUX_32 after inherit of multlib !!
  # it may break i*86 builds
-Line 66 
 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 85 
 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 106 
 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 ]]
-Line 126 
 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 146 
 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 169 
 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 190 
 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 204 
 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 234 
 mconfigure()
+Line 247 
 mconfigure()
  	for abi in ${abis_to_run}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		abi-${abi} oldmconfigure $@ || die
  	done
  }
-Line 257 
 cmake_configure()
+Line 270 
 cmake_configure()
  	for abi in ${abis_to_run}
  	do
  		SRCDIR="${saved_SRCDIR}-${abi}"
- 		cd ${SRCDIR}
+ 		cd ${SRCDIR}/${SRCSUBDIR}
  		abi-${abi} oldcmake_configure $@ || die
  	done
  	# restore SRCDIR
-Line 303 
 mmake()
+Line 316 
 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
  }
-Line 325 
 minstall()
+Line 338 
 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
  }
-Line 341 
 minstall_destdir()
+Line 354 
 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 363 
 mpatch()
+Line 376 
 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
  }
-Line 385 
 mlibtoolize()
+Line 398 
 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
  }
-Line 407 
 mautoreconf()
+Line 420 
 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
  }
-Line 430 
 minstalldocs()
+Line 443 
 minstalldocs()
  	for abi in ${abis_to_run}
  	do
- 		cd ${SRCDIR}-${abi}
+ 		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
  		oldminstalldocs $@ || die
  	done
  }
-Line 449 
 multilib_src_compile()
+Line 462 
 multilib_src_compile()
  	mmake
  }
+ multilib_src_check()
+ {
+ 	mmake -j1 -k check || die
+ }
  multilib_src_install()
  {
  	minstall_destdir
-Line 456 
 multilib_src_install()
+Line 474 
 multilib_src_install()
  	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
-Line 468 
 multilib_src_install()
+Line 486 
 multilib_src_install()
  	done
  }
- export_inherits multilib src_prepare src_compile src_install
+ export_inherits multilib src_prepare src_compile src_check src_install

 Legend:



Removed from v.9880
 


changed lines


 
Added in v.11547
 Legend:



Removed from v.9880
 


changed lines


 
Added in v.11547
-Removed from v.9880
+Added in v.11547