| 1 |
commit: 47097344d65802b639cd858f580a25687a438116 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 13 20:10:32 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 13 20:10:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47097344 |
| 7 |
|
| 8 |
sys-libs/glibc: Additional EAPI=7 fixes found by Arfrever |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.70, Repoman-2.3.16 |
| 11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-libs/glibc/glibc-9999.ebuild | 14 +++++++------- |
| 14 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 17 |
index 6e19a44aaa1..09bf788700f 100644 |
| 18 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 19 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 20 |
@@ -521,7 +521,7 @@ check_devpts() { |
| 21 |
[[ ${MERGE_TYPE} == "buildonly" ]] && return |
| 22 |
|
| 23 |
# Only sanity check when installing the native glibc. |
| 24 |
- [[ ${ROOT} != "/" ]] && return |
| 25 |
+ [[ -n ${ROOT} ]] && return |
| 26 |
|
| 27 |
# If they're opting in to the old suid code, then no need to check. |
| 28 |
use suid && return |
| 29 |
@@ -609,7 +609,7 @@ sanity_prechecks() { |
| 30 |
|
| 31 |
# Prevent native builds from downgrading |
| 32 |
if [[ ${MERGE_TYPE} != "buildonly" ]] && \ |
| 33 |
- [[ ${ROOT} == "/" ]] && \ |
| 34 |
+ [[ -z ${ROOT} ]] && \ |
| 35 |
[[ ${CBUILD} == ${CHOST} ]] && \ |
| 36 |
[[ ${CHOST} == ${CTARGET} ]] ; then |
| 37 |
|
| 38 |
@@ -1101,7 +1101,7 @@ src_configure() { |
| 39 |
} |
| 40 |
|
| 41 |
do_src_compile() { |
| 42 |
- emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" |
| 43 |
+ emake -C "$(builddir nptl)" |
| 44 |
} |
| 45 |
|
| 46 |
src_compile() { |
| 47 |
@@ -1166,7 +1166,7 @@ glibc_do_src_install() { |
| 48 |
local builddir=$(builddir nptl) |
| 49 |
cd "${builddir}" |
| 50 |
|
| 51 |
- emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install || die |
| 52 |
+ emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install |
| 53 |
|
| 54 |
# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support |
| 55 |
# which come without headers etc. Only needed for binary packages since the |
| 56 |
@@ -1348,7 +1348,7 @@ glibc_do_src_install() { |
| 57 |
|
| 58 |
# Generate all locales if this is a native build as locale generation |
| 59 |
if use compile-locales && ! is_crosscompile ; then |
| 60 |
- run_locale_gen --inplace-glibc "${ED%/}/" |
| 61 |
+ run_locale_gen --inplace-glibc "${ED}/" |
| 62 |
sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die |
| 63 |
fi |
| 64 |
} |
| 65 |
@@ -1443,7 +1443,7 @@ pkg_postinst() { |
| 66 |
|
| 67 |
if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then |
| 68 |
# Generate fastloading iconv module configuration file. |
| 69 |
- "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT%/}/" |
| 70 |
+ "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/" |
| 71 |
fi |
| 72 |
|
| 73 |
if ! is_crosscompile && [[ -z ${ROOT} ]] ; then |
| 74 |
@@ -1451,7 +1451,7 @@ pkg_postinst() { |
| 75 |
# errors from this step #253697 |
| 76 |
/sbin/telinit U 2>/dev/null |
| 77 |
|
| 78 |
- use compile-locales || run_locale_gen "${EROOT}" |
| 79 |
+ use compile-locales || run_locale_gen "${EROOT}/" |
| 80 |
fi |
| 81 |
|
| 82 |
# Check for sanity of /etc/nsswitch.conf, take 2 |
Archives