Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 493214 | Differences between
and this patch

Collapse All | Expand All

(-)001-debug-print-function/multilib-minimal.eclass (-3 / +21 lines)
Lines 29-34 case ${EAPI:-0} in Link Here
29
	*) die "EAPI=${EAPI} is not supported" ;;
29
	*) die "EAPI=${EAPI} is not supported" ;;
30
esac
30
esac
31
31
32
# @ECLASS-VARIABLE: MULTILIB_INSECURE_INSTALL
33
# @DEFAULT-UNSET
34
# @DESCRIPTION:
35
# If set to a nonempty value, multilib-minimal_src_install will not perform
36
# automatic checking of headers for inter-ABI conflicts, nor will it automate
37
# wrapping of header files.  Instead, multilib_src_install pseudophases will
38
# run without any special protection and the MULTILIB_WRAPPED_HEADERS array
39
# will be ignored.
40
# See:
41
# @CODE@
42
# http://devmanual.gentoo.org/eclass-reference/multilib-build.eclass/index.html
43
# @CODE@
44
# (or the multilib-build.eclass source itself) for further information about this
45
# feature.
32
46
33
inherit eutils multilib-build
47
inherit eutils multilib-build
34
48
Lines 108-122 multilib-minimal_src_install() { Link Here
108
				emake DESTDIR="${D}" install
122
				emake DESTDIR="${D}" install
109
			fi
123
			fi
110
		fi
124
		fi
111
		# Do multilib magic only when >1 ABI is used.
125
112
		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
126
		# Do multilib magic only when >1 ABI is used and
127
		# MULTILIB_INSECURE_INSTALL is not set
128
		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 && \
129
		      -z ${MULTILIB_INSECURE_INSTALL} ]]; then
113
			multilib_prepare_wrappers
130
			multilib_prepare_wrappers
114
			multilib_check_headers
131
			multilib_check_headers
115
		fi
132
		fi
116
		popd >/dev/null || die
133
		popd >/dev/null || die
117
	}
134
	}
118
	multilib_foreach_abi multilib-minimal_abi_src_install
135
	multilib_foreach_abi multilib-minimal_abi_src_install
119
	multilib_install_wrappers
136
137
	[[ ${MULTILIB_INSECURE_INSTALL} ]] || multilib_install_wrappers
120
138
121
	if declare -f multilib_src_install_all >/dev/null ; then
139
	if declare -f multilib_src_install_all >/dev/null ; then
122
		multilib_src_install_all
140
		multilib_src_install_all

Return to bug 493214