mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 18:12:08 +02:00
*: Drop mentions of elibc_uclibc
This commit is contained in:
parent
2290c6922b
commit
1a5ddb2ca4
@ -47,7 +47,6 @@ src_prepare() {
|
||||
# going to include this so let's try to carry it forward.
|
||||
# Contact me if it needs updating. Bug #486782.
|
||||
# Anthony G. Basile <blueness@gentoo.org>.
|
||||
use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
|
||||
|
||||
# Remove profiled make files.
|
||||
find -name '*_p.mk' -delete
|
||||
|
@ -528,7 +528,7 @@ src_configure() {
|
||||
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
|
||||
|
||||
# Perl has problems compiling with -Os in your flags with glibc
|
||||
use elibc_uclibc || replace-flags "-Os" "-O2"
|
||||
replace-flags "-Os" "-O2"
|
||||
|
||||
# xlocale.h is going away in glibc-2.26, so it's counterproductive
|
||||
# if we use it and include it in CORE/perl.h ... Perl builds just
|
||||
@ -737,7 +737,6 @@ src_test() {
|
||||
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
|
||||
return 0
|
||||
fi
|
||||
use elibc_uclibc && export MAKEOPTS+=" -j1"
|
||||
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
|
||||
}
|
||||
|
||||
|
@ -528,7 +528,7 @@ src_configure() {
|
||||
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
|
||||
|
||||
# Perl has problems compiling with -Os in your flags with glibc
|
||||
use elibc_uclibc || replace-flags "-Os" "-O2"
|
||||
replace-flags "-Os" "-O2"
|
||||
|
||||
# xlocale.h is going away in glibc-2.26, so it's counterproductive
|
||||
# if we use it and include it in CORE/perl.h ... Perl builds just
|
||||
@ -737,7 +737,6 @@ src_test() {
|
||||
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
|
||||
return 0
|
||||
fi
|
||||
use elibc_uclibc && export MAKEOPTS+=" -j1"
|
||||
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
|
||||
}
|
||||
|
||||
|
@ -529,7 +529,7 @@ src_configure() {
|
||||
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
|
||||
|
||||
# Perl has problems compiling with -Os in your flags with glibc
|
||||
use elibc_uclibc || replace-flags "-Os" "-O2"
|
||||
replace-flags "-Os" "-O2"
|
||||
|
||||
# xlocale.h is going away in glibc-2.26, so it's counterproductive
|
||||
# if we use it and include it in CORE/perl.h ... Perl builds just
|
||||
@ -738,7 +738,6 @@ src_test() {
|
||||
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
|
||||
return 0
|
||||
fi
|
||||
use elibc_uclibc && export MAKEOPTS+=" -j1"
|
||||
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
|
||||
}
|
||||
|
||||
|
@ -525,7 +525,7 @@ src_configure() {
|
||||
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
|
||||
|
||||
# Perl has problems compiling with -Os in your flags with glibc
|
||||
use elibc_uclibc || replace-flags "-Os" "-O2"
|
||||
replace-flags "-Os" "-O2"
|
||||
|
||||
# xlocale.h is going away in glibc-2.26, so it's counterproductive
|
||||
# if we use it and include it in CORE/perl.h ... Perl builds just
|
||||
@ -734,7 +734,6 @@ src_test() {
|
||||
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
|
||||
return 0
|
||||
fi
|
||||
use elibc_uclibc && export MAKEOPTS+=" -j1"
|
||||
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
|
||||
}
|
||||
|
||||
|
@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
|
||||
LICENSE="PSF-2"
|
||||
SLOT="${PYVER}"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"
|
||||
IUSE="berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"
|
||||
|
||||
# Do not add a dependency on dev-lang/python to this ebuild.
|
||||
# If you need to apply a patch which requires python for bootstrapping, please
|
||||
@ -292,7 +292,6 @@ src_install() {
|
||||
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
|
||||
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
|
||||
use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
|
||||
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
|
||||
|
||||
use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
|
||||
|
||||
|
@ -47,7 +47,6 @@ src_unpack() {
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${S}"/*.patch
|
||||
use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
|
||||
}
|
||||
|
||||
src_compile() { :;}
|
||||
|
@ -47,7 +47,6 @@ src_unpack() {
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${S}"/*.patch
|
||||
use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
|
||||
}
|
||||
|
||||
src_compile() { :;}
|
||||
|
@ -13,6 +13,5 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
|
||||
RDEPEND="!prefix? (
|
||||
elibc_glibc? ( sys-libs/glibc:2.2 )
|
||||
elibc_musl? ( sys-libs/musl )
|
||||
elibc_uclibc? ( sys-libs/uclibc )
|
||||
elibc_FreeBSD? ( sys-freebsd/freebsd-lib )
|
||||
)"
|
||||
|
@ -8,8 +8,8 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
|
||||
IUSE="elibc_glibc elibc_musl elibc_mintlib"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) ) )"
|
||||
|
@ -8,8 +8,8 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib"
|
||||
IUSE="elibc_glibc elibc_musl elibc_mintlib"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) )"
|
||||
|
@ -6,8 +6,8 @@ EAPI=5
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
IUSE="elibc_glibc elibc_uclibc elibc_musl"
|
||||
IUSE="elibc_glibc elibc_musl"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libiconv ) )"
|
||||
|
@ -8,8 +8,8 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="elibc_glibc elibc_uclibc"
|
||||
IUSE="elibc_glibc"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc. And don't force uClibc to dep on this.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) )"
|
||||
|
@ -8,8 +8,8 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="elibc_glibc elibc_musl elibc_uclibc"
|
||||
IUSE="elibc_glibc elibc_musl"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc. And don't force uClibc to dep on this.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )"
|
||||
|
@ -6,8 +6,8 @@ EAPI=5
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="elibc_glibc elibc_uclibc"
|
||||
IUSE="elibc_glibc"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc. And don't force uClibc to dep on this.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )"
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( sys-devel/gettext ) )"
|
||||
|
Loading…
x
Reference in New Issue
Block a user