Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 273648
Collapse All | Expand All

(-)a/bin/ebuild.sh (-14 / +49 lines)
Lines 905-917 dyn_prepare() { Link Here
905
		return 0
905
		return 0
906
	fi
906
	fi
907
907
908
	local srcdir
909
	if [[ -d $S ]] ; then
908
	if [[ -d $S ]] ; then
910
		srcdir=$S
909
		cd "${S}"
910
	elif hasq $EAPI 0 1 2; then
911
		cd "${WORKDIR}"
912
	elif [[ -z ${A} ]] && \
913
			! hasq unpack ${DEFINED_PHASES} && \
914
			! hasq prepare ${DEFINED_PHASES} ; then
915
		cd "${WORKDIR}"
911
	else
916
	else
912
		srcdir=$WORKDIR
917
		die "The source directory '${S}' doesn't exist"
913
	fi
918
	fi
914
	cd "$srcdir"
915
919
916
	trap abort_prepare SIGINT SIGQUIT
920
	trap abort_prepare SIGINT SIGQUIT
917
921
Lines 934-939 dyn_configure() { Link Here
934
		return 0
938
		return 0
935
	fi
939
	fi
936
940
941
	if [[ -d $S ]] ; then
942
		cd "${S}"
943
	elif hasq $EAPI 0 1 2; then
944
		cd "${WORKDIR}"
945
	elif [[ -z ${A} ]] && \
946
			! hasq unpack ${DEFINED_PHASES} && \
947
			! hasq prepare ${DEFINED_PHASES} && \
948
			! hasq configure ${DEFINED_PHASES} ; then
949
		cd "${WORKDIR}"
950
	else
951
		die "The source directory '${S}' doesn't exist"
952
	fi
953
937
	trap abort_configure SIGINT SIGQUIT
954
	trap abort_configure SIGINT SIGQUIT
938
955
939
	[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
956
	[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
Lines 957-962 dyn_compile() { Link Here
957
		return 0
974
		return 0
958
	fi
975
	fi
959
976
977
	if [[ -d $S ]] ; then
978
		cd "${S}"
979
	elif hasq $EAPI 0 1 2; then
980
		cd "${WORKDIR}"
981
	elif [[ -z ${A} ]] && \
982
			! hasq unpack ${DEFINED_PHASES} && \
983
			! hasq prepare ${DEFINED_PHASES} && \
984
			! hasq configure ${DEFINED_PHASES} && \
985
			! hasq compile ${DEFINED_PHASES} ; then
986
		cd "${WORKDIR}"
987
	else
988
		die "The source directory '${S}' doesn't exist"
989
	fi
990
960
	trap abort_compile SIGINT SIGQUIT
991
	trap abort_compile SIGINT SIGQUIT
961
992
962
	[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
993
	[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
Lines 989-994 dyn_test() { Link Here
989
	else
1020
	else
990
		cd "${WORKDIR}"
1021
		cd "${WORKDIR}"
991
	fi
1022
	fi
1023
992
	if ! hasq test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
1024
	if ! hasq test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
993
		vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
1025
		vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
994
	elif hasq test $RESTRICT; then
1026
	elif hasq test $RESTRICT; then
Lines 1023-1033 dyn_install() { Link Here
1023
	ebuild_phase pre_src_install
1055
	ebuild_phase pre_src_install
1024
	rm -rf "${PORTAGE_BUILDDIR}/image"
1056
	rm -rf "${PORTAGE_BUILDDIR}/image"
1025
	mkdir "${PORTAGE_BUILDDIR}/image"
1057
	mkdir "${PORTAGE_BUILDDIR}/image"
1026
	if [ -d "${S}" ]; then
1058
	local srcdir
1059
	if [[ -d $S ]] ; then
1027
		cd "${S}"
1060
		cd "${S}"
1028
	else
1061
	elif hasq $EAPI 0 1 2; then
1029
		cd "${WORKDIR}"
1062
		cd "${WORKDIR}"
1063
	elif [[ -z ${A} ]] && \
1064
			! hasq unpack ${DEFINED_PHASES} && \
1065
			! hasq prepare ${DEFINED_PHASES} && \
1066
			! hasq configure ${DEFINED_PHASES} && \
1067
			! hasq compile ${DEFINED_PHASES} && \
1068
			! hasq install ${DEFINED_PHASES}; then
1069
		cd "${WORKDIR}"
1070
	else
1071
		die "The source directory '${S}' doesn't exist"
1030
	fi
1072
	fi
1073
1031
	vecho
1074
	vecho
1032
	vecho ">>> Install ${PF} into ${D} category ${CATEGORY}"
1075
	vecho ">>> Install ${PF} into ${D} category ${CATEGORY}"
1033
	#our custom version of libtool uses $S and $D to fix
1076
	#our custom version of libtool uses $S and $D to fix
Lines 2014-2026 ebuild_main() { Link Here
2014
				cp "$EBUILD" "build-info/$PF.ebuild"
2057
				cp "$EBUILD" "build-info/$PF.ebuild"
2015
			fi
2058
			fi
2016
2059
2017
			local srcdir
2018
			if [[ -d $S ]] ; then
2019
				srcdir=$S
2020
			else
2021
				srcdir=$WORKDIR
2022
			fi
2023
			cd "$srcdir"
2024
			#our custom version of libtool uses $S and $D to fix
2060
			#our custom version of libtool uses $S and $D to fix
2025
			#invalid paths in .la files
2061
			#invalid paths in .la files
2026
			export S D
2062
			export S D
2027
- 

Return to bug 273648