diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38891 -> 38895 bytes | |||
| -rw-r--r-- | eclass/fcaps.eclass | 3 | ||||
| -rw-r--r-- | eclass/scons-utils.eclass | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 49abf87ea2de..b00ac0f53009 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass index 7b388849df60..467f955f5e9a 100644 --- a/eclass/fcaps.eclass +++ b/eclass/fcaps.eclass @@ -110,11 +110,12 @@ fcaps() { root=${EROOT:-${ROOT}} ;; esac + root=${root%/} # Process every file! local file for file ; do - [[ ${file} != /* ]] && file="${root}${file}" + [[ ${file} != /* ]] && file="${root}/${file}" if use filecaps ; then # Try to set capabilities. Ignore errors when the diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 02c9061ba95d..5335968bc52e 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -93,7 +93,7 @@ # -- EAPI support check -- case ${EAPI:-0} in - 0|1|2|3|4|5|6|7) ;; + 0|1|2|3|4|5|6) ;; *) die "EAPI ${EAPI} unsupported." esac @@ -135,6 +135,9 @@ escons() { _scons_clean_makeopts fi + # pass ebuild environment variables through! + local -x GENTOO_SCONS_ENV_PASSTHROUGH=1 + set -- scons ${SCONSOPTS} ${EXTRA_ESCONS} "${@}" echo "${@}" >&2 "${@}" |