|
Lines 146-151
_meson_get_machine_info() {
Link Here
|
| 146 |
|
146 |
|
| 147 |
# This may require adjustment based on CFLAGS |
147 |
# This may require adjustment based on CFLAGS |
| 148 |
cpu=${tuple%%-*} |
148 |
cpu=${tuple%%-*} |
|
|
149 |
|
| 150 |
local ver_opt |
| 151 |
case "${EAPI}" in |
| 152 |
6) ver_opt=--host-route ;; |
| 153 |
*) ver_opt=-b ;; |
| 154 |
esac |
| 155 |
if has_version "${ver_opt}" '<dev-util/meson-0.56.0'; then |
| 156 |
builtin_options="[properties]" |
| 157 |
else |
| 158 |
builtin_options="[built-in options]" |
| 159 |
fi |
| 149 |
} |
160 |
} |
| 150 |
|
161 |
|
| 151 |
# @FUNCTION: _meson_create_cross_file |
162 |
# @FUNCTION: _meson_create_cross_file |
|
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 |
${builtin_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 |
| 213 |
|
|
|
| 214 |
cat > "${fn}" <<-EOF |
224 |
cat > "${fn}" <<-EOF |
| 215 |
[binaries] |
225 |
[binaries] |
| 216 |
ar = $(_meson_env_array "$(tc-getBUILD_AR)") |
226 |
ar = $(_meson_env_array "$(tc-getBUILD_AR)") |
|
Lines 225-231
_meson_create_native_file() {
Link Here
|
| 225 |
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") |
235 |
strip = $(_meson_env_array "$(tc-getBUILD_STRIP)") |
| 226 |
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |
236 |
windres = $(_meson_env_array "$(tc-getBUILD_PROG RC windres)") |
| 227 |
|
237 |
|
| 228 |
[properties] |
238 |
${builtin_options} |
| 229 |
c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") |
239 |
c_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_CPPFLAGS}") |
| 230 |
c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") |
240 |
c_link_args = $(_meson_env_array "${BUILD_CFLAGS} ${BUILD_LDFLAGS}") |
| 231 |
cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") |
241 |
cpp_args = $(_meson_env_array "${BUILD_CXXFLAGS} ${BUILD_CPPFLAGS}") |
| 232 |
- |
|
|
