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

Parent Directory | Revision Log | Patch

	revision 307 by niro, Mon Dec 22 11:33:39 2008 UTC	revision 4783 by niro, Sun Dec 27 23:35:37 2009 UTC
#	Line 190  all-abis()	Line 190  all-abis()
190	# multilib compile functions	# multilib compile functions
191	##	##
192
193	# rename the old one	if [[ ! -z $(typeset -f mconfigure) ]]
194	old_mconfigure=old$(typeset -f mconfigure)	then
195	eval ${old_mconfigure}	# rename the old one
196		old_mconfigure=old$(typeset -f mconfigure)
197		eval "${old_mconfigure}"
198		fi
199	mconfigure()	mconfigure()
200	{	{
201	local abi	local abi
#	Line 208  mconfigure()	Line 211  mconfigure()
211	done	done
212	}	}
213
214	# rename the old one	if [[ ! -z $(typeset -f cmake_configure) ]]
215	old_munpack=old$(typeset -f munpack)	then
216	eval "${old_munpack}"	# rename the old one
217		old_cmake_configure=old$(typeset -f cmake_configure)
218		eval "${old_cmake_configure}"
219		fi
220		cmake_configure()
221		{
222		local abi
223		local abis_to_run="${MULTILIB_ABIS}"
224
225		# respect MULTILIB_ONLY_ABI variable
226		[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
227
228		local saved_SRCDIR="${SRCDIR}"
229		for abi in ${abis_to_run}
230		do
231		SRCDIR="${saved_SRCDIR}-${abi}"
232		cd ${SRCDIR}
233		abi-${abi} oldcmake_configure $@ || die
234		done
235		}
236
237		if [[ ! -z $(typeset -f munpack) ]]
238		then
239		# rename the old one
240		old_munpack=old$(typeset -f munpack)
241		eval "${old_munpack}"
242		fi
243	munpack()	munpack()
244	{	{
245	local abi	local abi
#	Line 227  munpack()	Line 256  munpack()
256	done	done
257	}	}
258
259	# rename the old one	if [[ ! -z $(typeset -f mmake) ]]
260	old_mmake=old$(typeset -f mmake)	then
261	eval "${old_mmake}"	# rename the old one
262		old_mmake=old$(typeset -f mmake)
263		eval "${old_mmake}"
264		fi
265	mmake()	mmake()
266	{	{
267	local abi	local abi
#	Line 246  mmake()	Line 278  mmake()
278	done	done
279	}	}
280
281	# rename the old one	if [[ ! -z $(typeset -f minstall) ]]
282	old_minstall=old$(typeset -f minstall)	then
283	eval "${old_minstall}"	# rename the old one
284		old_minstall=old$(typeset -f minstall)
285		eval "${old_minstall}"
286		fi
287	minstall()	minstall()
288	{	{
289	local abi	local abi
#	Line 281  minstall_destdir()	Line 316  minstall_destdir()
316	done	done
317	}	}
318
319	# rename the old one	if [[ ! -z $(typeset -f mpatch) ]]
320	old_mpatch=old$(typeset -f mpatch)	then
321	eval "${old_mpatch}"	# rename the old one
322		old_mpatch=old$(typeset -f mpatch)
323		eval "${old_mpatch}"
324		fi
325	mpatch()	mpatch()
326	{	{
327	local abi	local abi
#	Line 300  mpatch()	Line 338  mpatch()
338	done	done
339	}	}
340
341	# rename the old one	if [[ ! -z $(typeset -f mlibtoolize) ]]
342	old_mlibtoolize=old$(typeset -f mlibtoolize)	then
343	eval "${old_mlibtoolize}"	# rename the old one
344		old_mlibtoolize=old$(typeset -f mlibtoolize)
345		eval "${old_mlibtoolize}"
346		fi
347	mlibtoolize()	mlibtoolize()
348	{	{
349	local abi	local abi

---

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

Legend: Removed from v.307   changed lines   Added in v.4783