mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-30 18:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/multilib: Sync with gentoo

Browse Source 
It's from gentoo commit f64708850264e93cb54c8857d6eb459a4faf274e.
This commit is contained in:
Krzesimir Nowak 2021-12-21 10:41:58 +01:00
parent e6c6bb3e78
commit a3c22cc2ab
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sdk_container/src/third_party/portage-stable/eclass/multilib.eclass vendored
View File

@ -9,13 +9,11 @@
# @DESCRIPTION: # @DESCRIPTION:
# This eclass is for all functions pertaining to handling multilib configurations. # This eclass is for all functions pertaining to handling multilib configurations.
# Flatcar: we still have some packages that use old EAPI, revert this case ${EAPI:-0} in
# change when we update those packages. # EAPI=0 is still used by crossdev, bug #797367
#case ${EAPI:-0} in 0|5|6|7|8) ;;
# # EAPI=0 is still used by crossdev, bug #797367 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
# 0|5|6|7|8) ;; esac
# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
#esac
if [[ -z ${_MULTILIB_ECLASS} ]]; then if [[ -z ${_MULTILIB_ECLASS} ]]; then
_MULTILIB_ECLASS=1 _MULTILIB_ECLASS=1
@ -56,8 +54,7 @@ has_multilib_profile() {
# fall back on old behavior. Any profile that has these set should also # fall back on old behavior. Any profile that has these set should also
# depend on a newer version of portage (not yet released) which uses these # depend on a newer version of portage (not yet released) which uses these
# over CONF_LIBDIR in econf, dolib, etc... # over CONF_LIBDIR in econf, dolib, etc...
# Flatcar: Support older EAPIs for now. if [[ ${EAPI} == [05] ]] ; then
if [[ ${EAPI} == [0345] ]] ; then
get_libdir() { get_libdir() {
local CONF_LIBDIR local CONF_LIBDIR
if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then