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 (-4 / +7 lines)
Lines 54-60 EXPORT_FUNCTIONS src_configure src_compile src_test src_install Link Here
54
if [[ -z ${_MESON_ECLASS} ]]; then
54
if [[ -z ${_MESON_ECLASS} ]]; then
55
_MESON_ECLASS=1
55
_MESON_ECLASS=1
56
56
57
MESON_DEPEND=">=dev-util/meson-0.54.0
57
MESON_DEPEND=">=dev-util/meson-0.56.0
58
	>=dev-util/ninja-1.8.2
58
	>=dev-util/ninja-1.8.2
59
	dev-util/meson-format-array
59
	dev-util/meson-format-array
60
"
60
"
Lines 180-186 _meson_create_cross_file() { Link Here
180
	strip = $(_meson_env_array "$(tc-getSTRIP)")
180
	strip = $(_meson_env_array "$(tc-getSTRIP)")
181
	windres = $(_meson_env_array "$(tc-getRC)")
181
	windres = $(_meson_env_array "$(tc-getRC)")
182
182
183
	[properties]
183
	[built-in options]
184
	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
184
	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
185
	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
185
	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
186
	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
186
	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
Lines 191-196 _meson_create_cross_file() { Link Here
191
	objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
191
	objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
192
	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
192
	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
193
	objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
193
	objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
194
195
	[properties]
194
	needs_exe_wrapper = true
196
	needs_exe_wrapper = true
195
	sys_root = '${SYSROOT}'
197
	sys_root = '${SYSROOT}'
196
	pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
198
	pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
Lines 232-238 _meson_create_native_file() { Link Here
232
	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
234
	strip = $(_meson_env_array "$(tc-getBUILD_STRIP)")
233
	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
235
	windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)")
234
236
235
	[properties]
237
	[built-in options]
236
	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
238
	c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}")
237
	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
239
	c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}")
238
	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
240
	cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}")
Lines 243-248 _meson_create_native_file() { Link Here
243
	objc_link_args = $(_meson_env_array "${BUILD_OBJCFLAGS} ${BUILD_LDFLAGS}")
245
	objc_link_args = $(_meson_env_array "${BUILD_OBJCFLAGS} ${BUILD_LDFLAGS}")
244
	objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}")
246
	objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}")
245
	objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}")
247
	objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}")
248
249
	[properties]
246
	needs_exe_wrapper = false
250
	needs_exe_wrapper = false
247
	pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
251
	pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
248
252
249
- 

Return to bug 738710