commit: 80085d0f25460274dd4f37a39852e75004e37c42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 18:48:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 19:35:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80085d0f
sys-libs/glibc: fix too-long lines, variable order
Still a bunch of too-long lines to address though.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/glibc/glibc-2.39-r3.ebuild | 33 ++++++++++++++++++++-------------
sys-libs/glibc/glibc-2.39-r4.ebuild | 33 ++++++++++++++++++++-------------
sys-libs/glibc/glibc-9999.ebuild | 33 ++++++++++++++++++++-------------
3 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/sys-libs/glibc/glibc-2.39-r3.ebuild
b/sys-libs/glibc/glibc-2.39-r3.ebuild
index 1e6aadbb04e3..8a1b09f69a23 100644
--- a/sys-libs/glibc/glibc-2.39-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r3.ebuild
@@ -9,14 +9,6 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
TMPFILES_OPTIONAL=1
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
- multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/";
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
@@ -40,6 +32,12 @@ MIN_PAX_UTILS_VER="1.3.3"
# its seccomp filter!). Please double check this!
MIN_SYSTEMD_VER="254.9-r1"
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
+ multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/";
+
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
@@ -51,6 +49,8 @@ fi
SRC_URI+=" multilib-bootstrap? (
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
)"
SRC_URI+=" systemd? (
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
)"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat
headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux
+ssp stack-realign +static-libs suid systemd systemtap test vanilla"
# Here's how the cross-compile logic breaks down ...
@@ -213,7 +213,9 @@ XFAIL_NSPAWN_TEST_LIST=(
dump_build_environment() {
einfo ==== glibc build environment
========================================================
local v
- for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP
READELF; do
+ for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD \
+ {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY \
+ STRINGS OBJDUMP READELF; do
einfo " $(printf '%15s' ${v}:) ${!v}"
done
einfo
=====================================================================================
@@ -256,7 +258,9 @@ alt_build_headers() {
if tc-is-cross-compiler ; then
ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ;
then
- local header_path=$(echo '#include
<linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o
'[^"]*linux/version.h')
+ local header_path=$(echo '#include
<linux/version.h>' \
+ | $(tc-getCPP ${CTARGET}) ${CFLAGS}
2>&1 \
+ | grep -o '[^"]*linux/version.h')
ALT_BUILD_HEADERS=${header_path%/linux/version.h}
fi
fi
@@ -1363,9 +1367,11 @@ glibc_do_src_install() {
# Move versioned .a file out of libdir to evade portage QA
checks
# instead of using gen_usr_ldscript(). We fix ldscript as:
# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP (
/usr/lib64/glibc-<pv>/libm-<pv>.a ..."
- sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@"
"${ED}"/$(alt_usrlibdir)/libm.a || die
+ sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \
+ "${ED}"/$(alt_usrlibdir)/libm.a || die
dodir $(alt_usrlibdir)/${P}
- mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a
"${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+ mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \
+ "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a ||
die
fi
# We configure toolchains for standalone prefix systems with a sysroot,
@@ -1650,7 +1656,8 @@ pkg_preinst() {
# bug #802207
if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs
${FEATURES}; then
PRESERVED_OLD_LIBCRYPT=1
- cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)"
"${T}/libcrypt$(get_libname 1)" || die
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \
+ "${T}/libcrypt$(get_libname 1)" || die
else
PRESERVED_OLD_LIBCRYPT=0
fi
diff --git a/sys-libs/glibc/glibc-2.39-r4.ebuild
b/sys-libs/glibc/glibc-2.39-r4.ebuild
index 0033fe226b27..5d05b046a06e 100644
--- a/sys-libs/glibc/glibc-2.39-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.39-r4.ebuild
@@ -9,14 +9,6 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
TMPFILES_OPTIONAL=1
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
- multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/";
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
@@ -40,6 +32,12 @@ MIN_PAX_UTILS_VER="1.3.3"
# its seccomp filter!). Please double check this!
MIN_SYSTEMD_VER="254.9-r1"
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
+ multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/";
+
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
@@ -51,6 +49,8 @@ fi
SRC_URI+=" multilib-bootstrap? (
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
)"
SRC_URI+=" systemd? (
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
)"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat
headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux
+ssp stack-realign +static-libs suid systemd systemtap test vanilla"
# Here's how the cross-compile logic breaks down ...
@@ -213,7 +213,9 @@ XFAIL_NSPAWN_TEST_LIST=(
dump_build_environment() {
einfo ==== glibc build environment
========================================================
local v
- for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP
READELF; do
+ for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD \
+ {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY \
+ STRINGS OBJDUMP READELF; do
einfo " $(printf '%15s' ${v}:) ${!v}"
done
einfo
=====================================================================================
@@ -256,7 +258,9 @@ alt_build_headers() {
if tc-is-cross-compiler ; then
ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ;
then
- local header_path=$(echo '#include
<linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o
'[^"]*linux/version.h')
+ local header_path=$(echo '#include
<linux/version.h>' \
+ | $(tc-getCPP ${CTARGET}) ${CFLAGS}
2>&1 \
+ | grep -o '[^"]*linux/version.h')
ALT_BUILD_HEADERS=${header_path%/linux/version.h}
fi
fi
@@ -1363,9 +1367,11 @@ glibc_do_src_install() {
# Move versioned .a file out of libdir to evade portage QA
checks
# instead of using gen_usr_ldscript(). We fix ldscript as:
# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP (
/usr/lib64/glibc-<pv>/libm-<pv>.a ..."
- sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@"
"${ED}"/$(alt_usrlibdir)/libm.a || die
+ sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \
+ "${ED}"/$(alt_usrlibdir)/libm.a || die
dodir $(alt_usrlibdir)/${P}
- mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a
"${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+ mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \
+ "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a ||
die
fi
# We configure toolchains for standalone prefix systems with a sysroot,
@@ -1650,7 +1656,8 @@ pkg_preinst() {
# bug #802207
if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs
${FEATURES}; then
PRESERVED_OLD_LIBCRYPT=1
- cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)"
"${T}/libcrypt$(get_libname 1)" || die
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \
+ "${T}/libcrypt$(get_libname 1)" || die
else
PRESERVED_OLD_LIBCRYPT=0
fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index c3dce15e7e99..93936304f66f 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -9,14 +9,6 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
TMPFILES_OPTIONAL=1
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
- multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/";
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
@@ -40,6 +32,12 @@ MIN_PAX_UTILS_VER="1.3.3"
# its seccomp filter!). Please double check this!
MIN_SYSTEMD_VER="254.9-r1"
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
+ multilib systemd multiprocessing tmpfiles
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/";
+
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
@@ -51,6 +49,8 @@ fi
SRC_URI+=" multilib-bootstrap? (
https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
)"
SRC_URI+=" systemd? (
https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
)"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat
headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux
+ssp stack-realign +static-libs suid systemd systemtap test vanilla"
# Here's how the cross-compile logic breaks down ...
@@ -213,7 +213,9 @@ XFAIL_NSPAWN_TEST_LIST=(
dump_build_environment() {
einfo ==== glibc build environment
========================================================
local v
- for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD
{AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP
READELF; do
+ for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD \
+ {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY \
+ STRINGS OBJDUMP READELF; do
einfo " $(printf '%15s' ${v}:) ${!v}"
done
einfo
=====================================================================================
@@ -256,7 +258,9 @@ alt_build_headers() {
if tc-is-cross-compiler ; then
ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ;
then
- local header_path=$(echo '#include
<linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o
'[^"]*linux/version.h')
+ local header_path=$(echo '#include
<linux/version.h>' \
+ | $(tc-getCPP ${CTARGET}) ${CFLAGS}
2>&1 \
+ | grep -o '[^"]*linux/version.h')
ALT_BUILD_HEADERS=${header_path%/linux/version.h}
fi
fi
@@ -1363,9 +1367,11 @@ glibc_do_src_install() {
# Move versioned .a file out of libdir to evade portage QA
checks
# instead of using gen_usr_ldscript(). We fix ldscript as:
# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP (
/usr/lib64/glibc-<pv>/libm-<pv>.a ..."
- sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@"
"${ED}"/$(alt_usrlibdir)/libm.a || die
+ sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \
+ "${ED}"/$(alt_usrlibdir)/libm.a || die
dodir $(alt_usrlibdir)/${P}
- mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a
"${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+ mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \
+ "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a ||
die
fi
# We configure toolchains for standalone prefix systems with a sysroot,
@@ -1650,7 +1656,8 @@ pkg_preinst() {
# bug #802207
if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs
${FEATURES}; then
PRESERVED_OLD_LIBCRYPT=1
- cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)"
"${T}/libcrypt$(get_libname 1)" || die
+ cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \
+ "${T}/libcrypt$(get_libname 1)" || die
else
PRESERVED_OLD_LIBCRYPT=0
fi
