From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- sys-apps/util-linux/Manifest | 5 +- sys-apps/util-linux/util-linux-2.38.ebuild | 388 +++++++++++++++++++++++++++++ sys-apps/util-linux/util-linux-9999.ebuild | 104 ++++++-- 3 files changed, 474 insertions(+), 23 deletions(-) create mode 100644 sys-apps/util-linux/util-linux-2.38.ebuild (limited to 'sys-apps/util-linux') diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index b3ece45e35e2..02a26c12a268 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -6,8 +6,11 @@ AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c756098 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d DIST util-linux-2.37.3.tar.xz 6126260 BLAKE2B 6a541dd1f243f0fc303cd813b50be3e0edd8dc7377734aed90fe0af03321bf03fd727285e406b95a1db176572742245220f2e6e7f4d35e508e948816ec4b6345 SHA512 2303b5c55b1fd932c73b0a079d37e56e10b6a20270b72d0b7e81ec7a6b715b42ebaa336714c3e1722d05e5aa4499f8be17ceaf61bb1341532bf9697c9a2174e9 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7 +DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c +DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c EBUILD util-linux-2.37.2-r1.ebuild 8770 BLAKE2B a5662ed7720f636f06896b98662d94267ca0b6719614ddabbeb27600bc29232577c96b1af13a2574a16216a0f401635554753c42f815174e933522c7cd4aa0bb SHA512 d4834e6e9c585e150a6ace0c29063cbc895e61346d554da8c1e5606c2338ef7c4ff343d338913fbccb38886b9c1b83c9a3917a764ff368a10d3dd4f74077a343 EBUILD util-linux-2.37.3-r1.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a -EBUILD util-linux-9999.ebuild 9287 BLAKE2B f718a394674d8c3dd3c12a90524c2c7fa188559707becc3667c703cd1cca130fdc67cbf2b82ec4ada2c05a8ce4319618c12f3f4f7cd9e9a2e106d7d42006bedc SHA512 f5c69c551a033fe5de6242947b64d1856488ff7699c1209211afb5f485915e0d3a8fa34772378322c551de1614b9de6a1966db1da1c173d75474d009c5a5d6e0 +EBUILD util-linux-2.38.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736 +EBUILD util-linux-9999.ebuild 10595 BLAKE2B 25dcd9797b789de23789e5f48a671f675e33ca7066e3d7fa807ca2c28cb18d3bb37eee16f0fe0f8057a50253bd17a0aa02722f7fd1d9815a65ed4e6b3fc17ce8 SHA512 6073ce8f64433a53e3cd65c5bb93ee0c60be9c799c17cd103182b743e8c85eff63bdf747348f77216e7b5234318cb969da1fec9b64deb5bda111600e455f8736 MISC metadata.xml 1527 BLAKE2B 66d5b1f7f5fd85b467ec66f69c1ae71e61e41cd221ef8a52b39b09984dbabe63b26243183dbc86e8d1e5c6b0fa6866cccc18e454f741d40b6e146d9f8f1f8f80 SHA512 a6428edad3baa98b177d3363162fdffc6258305b956b9fef504341da43697935f5ff41bc9adc5d6327571f0f0bfd3148356f01f17e287b675c8c3a42e7dcea5a diff --git a/sys-apps/util-linux/util-linux-2.38.ebuild b/sys-apps/util-linux/util-linux-2.38.ebuild new file mode 100644 index 000000000000..68bb10664cf1 --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.38.ebuild @@ -0,0 +1,388 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \ + pam python-r1 multilib-minimal multiprocessing systemd + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc + inherit verify-sig + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + fi + + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )" +fi + +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" + +LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode" + +# Most lib deps here are related to programs rather than our libs, +# so we rarely need to specify ${MULTILIB_USEDEP}. +RDEPEND=" + virtual/libcrypt:= + audit? ( >=sys-process/audit-2.6:= ) + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib:= ) + cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) + hardlink? ( dev-libs/libpcre2:= ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)?] + magic? ( sys-apps/file:0= ) + ) + nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + rtas? ( sys-libs/librtas ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + !build? ( systemd? ( sys-apps/systemd ) ) + udev? ( virtual/libudev:= )" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) +" +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" + hardlink? ( !app-arch/hardlink ) + logger? ( !>=app-admin/sysklogd-2.0[logger] ) + kill? ( + !sys-apps/coreutils[kill] + !sys-process/procps[kill] + ) + su? ( + !=sys-apps/shadow-4.7-r2[su] + ) + !net-wireless/rfkill +" + +if [[ ${PV} == 9999 ]] ; then + # Required for man-page generation + BDEPEND+=" dev-ruby/asciidoctor" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" +RESTRICT="!test? ( test )" + +pkg_pretend() { + if use su && ! use suid ; then + elog "su will be installed as suid despite USE=-suid (bug #832092)" + elog "To use su without suid, see e.g. Portage's suidctl feature." + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + return + fi + + if use verify-sig ; then + mkdir "${T}"/verify-sig || die + pushd "${T}"/verify-sig &>/dev/null || die + + # Upstream sign the decompressed .tar + # Let's do it separately in ${T} then cleanup to avoid external + # effects on normal unpack. + cp "${DISTDIR}"/${MY_P}.tar.xz . || die + xz -d ${MY_P}.tar.xz || die + verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign + + popd &>/dev/null || die + rm -r "${T}"/verify-sig || die + fi + + default +} + +src_prepare() { + default + + if use test ; then + # Prevent uuidd test failure due to socket path limit, bug #593304 + sed -i \ + -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ + tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + + # Known-failing tests + # TODO: investigate these + local known_failing_tests=( + # Subtest 'options-maximum-size-8192' fails + hardlink/options + + lsfd/mkfds-symlink + lsfd/mkfds-rw-character-device + ) + + local known_failing_test + for known_failing_test in "${known_failing_tests[@]}" ; do + einfo "Removing known-failing test: ${known_failing_test}" + rm tests/ts/${known_failing_test} || die + done + + fi + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + else + elibtoolize + fi +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS, bug #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include + main() { return fallocate(0, 0, 0, 0); } + EOF + + append-lfs-flags + + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +python_configure() { + local myeconfargs=( + "${commonargs[@]}" + --disable-all-programs + --disable-bash-completion + --without-systemdsystemunitdir + --with-python + --enable-libblkid + --enable-libmount + --enable-pylibmount + ) + + mkdir "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" >/dev/null || die + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + popd >/dev/null || die +} + +multilib_src_configure() { + lfs_fallocate_test + + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. bug #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + + # bug #485486 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) + # bug #545042 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. + # bug #601530 + export NCURSES6_CONFIG=false NCURSES5_CONFIG=false + export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false + + # Avoid automagic dependency on ppc* + export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas) + + # configure args shared by python and non-python builds + local commonargs=( + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" + ) + + local myeconfargs=( + "${commonargs[@]}" + --with-bashcompletiondir="$(get_bashcompdir)" + --without-python + $(multilib_native_use_enable suid makeinstall-chown) + $(multilib_native_use_enable suid makeinstall-setuid) + $(multilib_native_use_with readline) + $(multilib_native_use_with slang) + $(multilib_native_use_with systemd) + $(multilib_native_use_with udev) + $(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic') + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') + $(multilib_native_use_with audit) + $(tc-has-tls || echo --disable-tls) + $(use_enable nls) + $(use_enable unicode widechar) + $(use_enable static-libs static) + $(use_with ncurses tinfo) + $(use_with selinux) + ) + + if multilib_is_native_abi ; then + myeconfargs+=( + --disable-chfn-chsh + --disable-login + --disable-newgrp + --disable-nologin + --disable-pylibmount + --disable-raw + --disable-vipw + --enable-agetty + --enable-bash-completion + --enable-line + --enable-partx + --enable-rename + --enable-rfkill + --enable-schedutils + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable caps setpriv) + $(use_enable cramfs) + $(use_enable fdformat) + $(use_enable hardlink) + $(use_enable kill) + $(use_enable logger) + $(use_enable ncurses pg) + $(use_enable su) + $(use_enable tty-helpers mesg) + $(use_enable tty-helpers wall) + $(use_enable tty-helpers write) + $(use_with cryptsetup) + ) + if [[ ${PV} == *9999 ]] ; then + myeconfargs+=( --enable-asciidoc ) + else + # Upstream is shipping pre-generated man-pages for releases + myeconfargs+=( --disable-asciidoc ) + fi + else + myeconfargs+=( + --disable-all-programs + --disable-asciidoc + --disable-bash-completion + --without-systemdsystemunitdir + + # build libraries + --enable-libuuid + --enable-libblkid + --enable-libsmartcols + --enable-libfdisk + --enable-libmount + ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi && use python ; then + python_foreach_impl python_configure + fi +} + +python_compile() { + pushd "${BUILD_DIR}" >/dev/null || die + emake all + popd >/dev/null || die +} + +multilib_src_compile() { + emake all + + if multilib_is_native_abi && use python ; then + python_foreach_impl python_compile + fi +} + +python_test() { + pushd "${BUILD_DIR}" >/dev/null || die + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + popd >/dev/null || die +} + +multilib_src_test() { + emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot" + if multilib_is_native_abi && use python ; then + python_foreach_impl python_test + fi +} + +python_install() { + pushd "${BUILD_DIR}" >/dev/null || die + emake DESTDIR="${D}" install + python_optimize + popd >/dev/null || die +} + +multilib_src_install() { + if multilib_is_native_abi && use python ; then + python_foreach_impl python_install + fi + + # This needs to be called AFTER python_install call, bug #689190 + emake DESTDIR="${D}" install + + if multilib_is_native_abi ; then + # Need the libs in / + gen_usr_ldscript -a blkid fdisk mount smartcols uuid + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + find "${ED}" -name "*.la" -delete || die + + if use pam ; then + # See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + + newpamd "${FILESDIR}/su-l.pamd" su-l + fi + + if use su && ! use suid ; then + # Always force suid su, even when USE=-suid, as su is useless + # for the overwhelming-majority case without suid. + # Users who wish to truly have a no-suid su can strip it out + # via e.g. Portage's suidctl or some other hook. + # See bug #832092 + fperms u+s /bin/su + fi + + # Note: + # Bash completion for "runuser" command is provided by same file which + # would also provide bash completion for "su" command. However, we don't + # use "su" command from this package. + # This triggers a known QA warning which we ignore for now to magically + # keep bash completion for "su" command which shadow package does not + # provide. +} + +pkg_postinst() { + if ! use tty-helpers ; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 658e0639ff89..68bb10664cf1 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -15,11 +15,19 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc + inherit verify-sig + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + fi + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )" fi +S="${WORKDIR}/${MY_P}" + DESCRIPTION="Various useful Linux utilities" HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux" @@ -72,18 +80,16 @@ RDEPEND+=" !net-wireless/rfkill " -# Required for man-page generation -if [[ "${PV}" == 9999 ]] ; then - BDEPEND+=" - dev-ruby/asciidoctor - " +if [[ ${PV} == 9999 ]] ; then + # Required for man-page generation + BDEPEND+=" dev-ruby/asciidoctor" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )" RESTRICT="!test? ( test )" -S="${WORKDIR}/${MY_P}" - pkg_pretend() { if use su && ! use suid ; then elog "su will be installed as suid despite USE=-suid (bug #832092)" @@ -91,30 +97,75 @@ pkg_pretend() { fi } +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + return + fi + + if use verify-sig ; then + mkdir "${T}"/verify-sig || die + pushd "${T}"/verify-sig &>/dev/null || die + + # Upstream sign the decompressed .tar + # Let's do it separately in ${T} then cleanup to avoid external + # effects on normal unpack. + cp "${DISTDIR}"/${MY_P}.tar.xz . || die + xz -d ${MY_P}.tar.xz || die + verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign + + popd &>/dev/null || die + rm -r "${T}"/verify-sig || die + fi + + default +} + src_prepare() { default - # Prevent uuidd test failure due to socket path limit. #593304 - sed -i \ - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ - tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + if use test ; then + # Prevent uuidd test failure due to socket path limit, bug #593304 + sed -i \ + -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \ + tests/ts/uuid/uuidd || die "Failed to fix uuidd test" + + # Known-failing tests + # TODO: investigate these + local known_failing_tests=( + # Subtest 'options-maximum-size-8192' fails + hardlink/options + + lsfd/mkfds-symlink + lsfd/mkfds-rw-character-device + ) + + local known_failing_test + for known_failing_test in "${known_failing_tests[@]}" ; do + einfo "Removing known-failing test: ${known_failing_test}" + rm tests/ts/${known_failing_test} || die + done + + fi if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf + else + elibtoolize fi - - elibtoolize } lfs_fallocate_test() { - # Make sure we can use fallocate with LFS #300307 + # Make sure we can use fallocate with LFS, bug #300307 cat <<-EOF > "${T}"/fallocate.${ABI}.c #define _GNU_SOURCE #include main() { return fallocate(0, 0, 0, 0); } EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ || export ac_cv_func_fallocate=no rm -f "${T}"/fallocate.${ABI}.c @@ -131,6 +182,7 @@ python_configure() { --enable-libmount --enable-pylibmount ) + mkdir "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" @@ -139,14 +191,19 @@ python_configure() { multilib_src_configure() { lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. # Blindly assume a POSIX setup since we require libmount, and libmount - # itself fails when the scanf test fails. #531856 + # itself fails when the scanf test fails. bug #531856 tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - # Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530 + # bug #485486 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) + # bug #545042 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) + + # Undo bad ncurses handling by upstream. Fall back to pkg-config. + # bug #601530 export NCURSES6_CONFIG=false NCURSES5_CONFIG=false export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false @@ -179,6 +236,7 @@ multilib_src_configure() { $(use_with ncurses tinfo) $(use_with selinux) ) + if multilib_is_native_abi ; then myeconfargs+=( --disable-chfn-chsh @@ -221,6 +279,7 @@ multilib_src_configure() { --disable-asciidoc --disable-bash-completion --without-systemdsystemunitdir + # build libraries --enable-libuuid --enable-libblkid @@ -229,6 +288,7 @@ multilib_src_configure() { --enable-libmount ) fi + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" if multilib_is_native_abi && use python ; then @@ -275,11 +335,11 @@ multilib_src_install() { python_foreach_impl python_install fi - # This needs to be called AFTER python_install call (#689190) + # This needs to be called AFTER python_install call, bug #689190 emake DESTDIR="${D}" install if multilib_is_native_abi ; then - # need the libs in / + # Need the libs in / gen_usr_ldscript -a blkid fdisk mount smartcols uuid fi } -- cgit v1.2.3