diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-18 15:11:02 +0000 |
commit | 0fb71e0215ed52863e462cccef73c01aff44d43d (patch) | |
tree | 428fc3fa92f9c69ed02878e9b6151a9fb810e651 /sys-libs/glibc | |
parent | 9bd54251864651f49e673a08aec9ef79cfe08f04 (diff) |
gentoo resync : 18.12.2017
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r-- | sys-libs/glibc/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.26-r3.ebuild | 11 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 11 |
3 files changed, 20 insertions, 6 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d16fd3999d59..2c578b660199 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -41,6 +41,6 @@ EBUILD glibc-2.22-r4.ebuild 5009 BLAKE2B c627e49eef4e48b62d1f2f464da61f9d77de1f3 EBUILD glibc-2.23-r4.ebuild 5011 BLAKE2B 5b002c214f74b9eeb1c5898c32560bd7b8f865138fd7c4851887f3f81be98635285344eca8cb88264b3b527b8a3dd1f03008beb642461a8fcb98ea309c08ee3e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221 EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92ab239a6086164593b63338cf7a841f3cde2891cb108859ea41d2b9993884411d132a8db787d2cc06e9a7087cdf SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2 EBUILD glibc-2.25-r9.ebuild 5039 BLAKE2B 0706fb07b8ebe4c746e0654274a7a7ee60e197e8765b8f78995af7b0ed11327628ccb5addfe423205e63f00990b19e1d1a6c22104ca437966d947ad2913354fb SHA512 bbcfc6992111c0b8a4638c0d1fe45c1f95f9f03a3db79afbd2a7a61f4736d38810f191bbb0cc4cecdedf4485c2586419f867587084575c5f50e5e7b7cea7228b -EBUILD glibc-2.26-r3.ebuild 24818 BLAKE2B c6d94bc8c4a336951427984084b1c0d48263108f863c2b8378f0177934d96628d5b4d510f661bc05522205e326f7ab58b1f879a0259261eceee69924389cacb3 SHA512 e6e0c2b4a481151aae29230486d5a83f18070128e31e171d6083d169bda1c828641c8cb9d7e4ad89dcbdaa014c81a10030a37f47a0f918dfbdaa216963ca3bba -EBUILD glibc-9999.ebuild 25060 BLAKE2B c0e2a92beda9b42402265d283ac9993229b143f8cd2392c6f2a21bbf5d222a7e494b62aee77891a2a2bbfba9759227ff2651f5d948ca645ee205e42381f45eaf SHA512 35fcdbc25be22cb6c0bd4f52fa6f3b5cb5e5ef0f74515b73398eb7911eab8c6a31b08f56eef048134da2762478ff469c6b41307c76f4725f8efbc43eb2885dc4 +EBUILD glibc-2.26-r3.ebuild 24943 BLAKE2B 42d1721d3cc9621368983e0933917c0ba7c67c1472d8cdac35112030d65c8dd4578a214d2546acb22c306ffcad29ba9c72c4d940f523578160c0b6ca35c9dbc8 SHA512 af5463d3757b70cbfffc3d2c7b82e30ada86de8d0aeb105dc3708d23bbd1beb444c0f0ceb948fd10594697e5a590085fac2dc8675fc856d93774d1d772bf65c5 +EBUILD glibc-9999.ebuild 25185 BLAKE2B e68de57a706879b932db7089c9981107bb9cac9056f1607800fa1f5e452cb4369f14d30596ea77adf92f562d3ef646600bdaa15515ade14fd85e11ff4063d8b4 SHA512 2f10ca2c5535a4c542ee4a8141841a501c738d07715da1e0e2f70da4cccb54ff28bee9f90917fa26ad32779f48f446c96d73e1601b037bad70a40665f1eaeafe MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild index 88a9cd4b5b3d..ceb5b6846859 100644 --- a/sys-libs/glibc/glibc-2.26-r3.ebuild +++ b/sys-libs/glibc/glibc-2.26-r3.ebuild @@ -32,7 +32,7 @@ PATCH_VER=4 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" -IUSE="audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" # Min kernel version glibc requires : ${NPTL_KERN_VER:="3.2.0"} @@ -80,6 +80,7 @@ DEPEND="${COMMON_DEPEND} >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 + doc? ( sys-apps/texinfo ) " RDEPEND="${COMMON_DEPEND} !sys-kernel/ps3-sources @@ -286,8 +287,14 @@ glibc_do_configure() { einfo "Configuring glibc for $1" + if use doc ; then + export MAKEINFO=makeinfo + else + export MAKEINFO=/dev/null + fi + local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do einfo " $(printf '%15s' ${v}:) ${!v}" done diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index a3b427221e28..68d17a224695 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -33,7 +33,7 @@ PATCH_VER="3" SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" -IUSE="audit caps compile-locales debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" # Min kernel version glibc requires : ${NPTL_KERN_VER:="3.2.0"} @@ -85,6 +85,7 @@ DEPEND="${COMMON_DEPEND} >=app-misc/pax-utils-0.1.10 !<sys-apps/sandbox-1.6 !<sys-apps/portage-2.1.2 + doc? ( sys-apps/texinfo ) " RDEPEND="${COMMON_DEPEND} !sys-kernel/ps3-sources @@ -298,8 +299,14 @@ glibc_do_configure() { einfo "Configuring glibc for nptl" + if use doc ; then + export MAKEINFO=makeinfo + else + export MAKEINFO=/dev/null + fi + local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS ; do + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO ; do einfo " $(printf '%15s' ${v}:) ${!v}" done |