|
Line
Link Here
|
| 0 |
-- eclass/meson.eclass |
0 |
++ eclass/meson.eclass |
|
Lines 248-254
Link Here
|
| 248 |
objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}") |
248 |
objcpp_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_CPPFLAGS}") |
| 249 |
objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}") |
249 |
objcpp_link_args = $(_meson_env_array "${BUILD_OBJCXXFLAGS} ${BUILD_LDFLAGS}") |
| 250 |
needs_exe_wrapper = false |
250 |
needs_exe_wrapper = false |
| 251 |
pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |
251 |
pkg_config_libdir = '${BUILD_PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir $([[ $EAPI == 6 ]] || echo -b))/pkgconfig}' |
| 252 |
|
252 |
|
| 253 |
[build_machine] |
253 |
[build_machine] |
| 254 |
system = '${system}' |
254 |
system = '${system}' |
| 255 |
-- /usr/lib/portage/python3.8/phase-helpers.sh |
255 |
++ /usr/lib/portage/python3.8/phase-helpers.sh |
|
Lines 940-951
Link Here
|
| 940 |
|
940 |
|
| 941 |
if ___eapi_has_get_libdir; then |
941 |
if ___eapi_has_get_libdir; then |
| 942 |
get_libdir() { |
942 |
get_libdir() { |
| 943 |
local libdir_var="LIBDIR_${ABI}" |
943 |
local -a cmd=() |
| 944 |
local libdir="lib" |
|
|
| 945 |
|
944 |
|
| 946 |
[[ -n ${ABI} && -n ${!libdir_var} ]] && libdir=${!libdir_var} |
945 |
if [[ $1 = -b ]]; then |
|
|
946 |
___eapi_best_version_and_has_version_support_-b_-d_-r || |
| 947 |
die "${FUNCNAME[1]}: option -b is not supported with EAPI ${EAPI}" |
| 947 |
|
948 |
|
| 948 |
echo "${libdir}" |
949 |
if ___eapi_has_prefix_variables; then |
|
|
950 |
cmd+=(env -i PORTAGE_CONFIGROOT="/${PORTAGE_OVERRIDE_EPREFIX#/}") |
| 951 |
else |
| 952 |
cmd+=(env -i PORTAGE_CONFIGROOT=/) |
| 953 |
fi |
| 954 |
fi |
| 955 |
|
| 956 |
# [[ -n $PORTAGE_IPC_DAEMON ]] && cmd+=("${PORTAGE_BIN_PATH}/ebuild-ipc") || |
| 957 |
cmd+=("${PORTAGE_BIN_PATH}/ebuild-helpers/portageq") |
| 958 |
|
| 959 |
local abi=$("${cmd[@]}" envvar ABI 2>/dev/null) |
| 960 |
local libdir_abi=$("${cmd[@]}" envvar "LIBDIR_${abi}" 2>/dev/null) |
| 961 |
[[ -n ${abi} && -n ${libdir_abi} ]] && echo ${libdir_abi} || echo lib |
| 949 |
} |
962 |
} |
| 950 |
fi |
963 |
fi |
