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

Collapse All | Expand All

(-)a/eclass/meson.eclass (-3 / +24 lines)
Lines 159-165 _meson_create_cross_file() { Link Here
159
	_meson_get_machine_info "${CHOST}"
159
	_meson_get_machine_info "${CHOST}"
160
160
161
	local fn=${T}/meson.${CHOST}.${ABI}.ini
161
	local fn=${T}/meson.${CHOST}.${ABI}.ini
162
	local options
162
163
164
	local ver_opt
165
	case "${EAPI}" in
166
		6) ver_opt=--host-route ;;
167
		*) ver_opt=-b ;;
168
	esac
169
	if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then
170
		options="[properties]"
171
	else
172
		options="[built-in options]"
173
	fi
163
	cat > "${fn}" <<-EOF
174
	cat > "${fn}" <<-EOF
164
	[binaries]
175
	[binaries]
165
	ar = $(_meson_env_array "$(tc-getAR)")
176
	ar = $(_meson_env_array "$(tc-getAR)")
Lines 174-180 _meson_create_cross_file() { Link Here
174
	strip = $(_meson_env_array "$(tc-getSTRIP)")
185
	strip = $(_meson_env_array "$(tc-getSTRIP)")
175
	windres = $(_meson_env_array "$(tc-getRC)")
186
	windres = $(_meson_env_array "$(tc-getRC)")
176
187
177
	[properties]
188
	${options}
178
	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
189
	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
179
	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
190
	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
180
	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
191
	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
Lines 210-216 _meson_create_native_file() { Link Here
210
	_meson_get_machine_info "${CBUILD}"
221
	_meson_get_machine_info "${CBUILD}"
211
222
212
	local fn=${T}/meson.${CBUILD}.${ABI}.ini
223
	local fn=${T}/meson.${CBUILD}.${ABI}.ini
224
	local options
213
225
226
	local ver_opt
227
	case "${EAPI}" in
228
		6) ver_opt=--host-route ;;
229
		*) ver_opt=-b ;;
230
	esac
231
	if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then
232
		options="[properties]"
233
	else
234
		options="[built-in options]"
235
	fi
214
	cat > "${fn}" <<-EOF
236
	cat > "${fn}" <<-EOF
215
	[binaries]
237
	[binaries]
216
	ar = $(_meson_env_array "$(tc-getBUILD_AR)")
238
	ar = $(_meson_env_array "$(tc-getBUILD_AR)")
Lines 225-231 _meson_create_native_file() { Link Here
225
	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
247
	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
226
	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
248
	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
227
249
228
	[properties]
250
	${options}
229
	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
251
	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
230
	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
252
	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
231
	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
253
	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
232
- 

Return to bug 738710