Diff of /trunk/mage/usr/lib/mage/smage2.functions.sh

Parent Directory | Revision Log | Patch

	revision 1679 by niro, Mon Feb 6 10:04:33 2012 UTC	revision 1689 by niro, Thu Feb 16 11:58:12 2012 UTC
#	Line 7	Line 7
7	smagesource()	smagesource()
8	{	{
9	local file="$1"	local file="$1"
10	local mystate	local localstate
11		local distfilestate
12	local mytag	local mytag
13
14	source ${file}	source ${file}
#	Line 29  smagesource()	Line 30  smagesource()
30	fi	fi
31	fi	fi
32
33	[[ -n ${STATE} ]] && mystate="${STATE}"	[[ -n ${STATE} ]] && localstate="${STATE}"
34	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
35
	# do not overide if local state was broken or disabled!
	case ${STATE} in
	broken) return ;;
	disabled) return ;;
	esac
36	if [ -f ${SMAGESCRIPTSDIR}/distribution ]	if [ -f ${SMAGESCRIPTSDIR}/distribution ]
37	then	then
38	source ${SMAGESCRIPTSDIR}/distribution	source ${SMAGESCRIPTSDIR}/distribution
39	[[ -n ${STATE} ]] && mystate="${STATE}"	[[ -n ${STATE} ]] && distfilestate="${STATE}"
40	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
41	fi	fi
42	# now switch state and export it	# now switch state and export it but do not overide any local states
43	STATE="${mystate}"	if [[ ! -z ${localstate} ]]
44		then
45		STATE="${localstate}"
46		else
47		STATE="${distfilestate}"
48		fi
49
50	if mqueryfeature "pkgdistrotag"	if mqueryfeature "pkgdistrotag"
51	then	then
#	Line 59  smagesource()	Line 59  smagesource()
59	echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"	echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
60	echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"	echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
61	else	else
62	# now switch state and export it	# now switch state and export it but do not overide any local states
63	export DISTROTAG="${mytag}"	export DISTROTAG="${mytag}"
64	fi	fi
65	else	else
#	Line 281  mconfigure()	Line 281  mconfigure()
281	fi	fi
282	fi	fi
283
284	# always enable shared by default	# always enable shared by default but not for waf configure
285	if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]	if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]] &&
286		[[ -z $(./configure --version | grep waf) ]]
287	then	then
288	myopts+=" --enable-shared"	myopts+=" --enable-shared"
289	fi	fi
#	Line 570  sminclude()	Line 571  sminclude()
571	fi	fi
572	}	}
573
574		march()
575		{
576		local retval
577
578		if [[ ! -z ${ARCH} ]]
579		then
580		echo "${ARCH}"
581		retval=0
582		else
583		retval=1
584		fi
585
586		return "${retval}"
587		}
588
589		marchsrcfile()
590		{
591		local retval
592		if [[ ! -z $(eval echo \$SRCFILE_${ARCH/i*86/x86}) ]]
593		then
594		eval echo \$SRCFILE_${ARCH/i*86/x86} | tr ';' '\n'
595		retval=0
596		else
597		retval=1
598		fi
599
600		return "${retval}"
601		}
602
603		marchsrcdir()
604		{
605		local retval
606		if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
607		then
608		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
609		retval=0
610		else
611		retval=1
612		fi
613
614		return "${retval}"
615		}
616
617		marchdepend()
618		{
619		local retval
620
621		if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
622		then
623		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
624		retval=0
625		else
626		retval=1
627		fi
628
629		return "${retval}"
630		}
631
632		marchsdepend()
633		{
634		local retval
635		if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
636		then
637		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
638		retval=0
639		else
640		retval=1
641		fi
642
643		return "${retval}"
644		}
645
646	setup_distcc_environment()	setup_distcc_environment()
647	{	{
648	if [ -x /usr/bin/distcc ]	if [ -x /usr/bin/distcc ]

---

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

Legend: Removed from v.1679   changed lines   Added in v.1689