From 75fc75ae1f0481ffdb78450e801a9b443ba641bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Mar 2018 10:55:17 +0100 Subject: gentoo resync : 31.03.2018 --- sys-libs/glibc/Manifest | 8 ++++---- sys-libs/glibc/glibc-2.25-r11.ebuild | 2 +- sys-libs/glibc/glibc-2.26-r6.ebuild | 17 +++++++++++++---- sys-libs/glibc/glibc-2.27-r1.ebuild | 26 ++++++++++++++++++++++---- sys-libs/glibc/glibc-9999.ebuild | 26 ++++++++++++++++++++++---- 5 files changed, 62 insertions(+), 17 deletions(-) (limited to 'sys-libs/glibc') diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 9ade6fbcb525..671d4650fe40 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -48,10 +48,10 @@ EBUILD glibc-2.22-r4.ebuild 4973 BLAKE2B 6f4f632413cacf34a2a011d8cc83d0a92deaa09 EBUILD glibc-2.23-r4.ebuild 4975 BLAKE2B 9a0d3a3689896fab9f71fa20a83be5f2563f023040563f85385f8d28d32d6eee7f144acbdf4a35d6c1a65d56289ae72813b1d7f561f514e391e95dd4e43a4902 SHA512 9662308abee890c1eeaa45a49c4238448c62400d8b8661fc7588cd78aa58cbe044a0c15f46a6e8d161a203f3645600385fc2200d4d6434c24e496781aa06b04a EBUILD glibc-2.24-r4.ebuild 5011 BLAKE2B 71050f0449074652d4fabc709326025b4de2e6642fdde87898acfde6f99cce95f4d7b9e1e7f9eedcdf6d2fd70ebf3c2860599ec36ccf68e0e633ec794f8ce0e8 SHA512 1cb3bcbd7d9d7f7c095bdff7c81d0acc3b4700c0b8a9d4fd0499cbf53abb55c67ca3bc3cce125916d238eb8cf6f6d69989af27defd6f194aaa5ac27cdda94eb9 EBUILD glibc-2.25-r10.ebuild 5002 BLAKE2B c02b66123475631ccd8cde92dc533c1057b1c1308f797948db8caad0cdec2a83a5ff241bc6d1b2e845f46f28bd8b874cd0cf1f761e3181c7a3b1129e1fd99611 SHA512 5342f2d433ae255670732d8f2e6cd21d648b6fe93500cc3697f31aac06ef7e252769608e1c17d5407e075c78602124a8f62ee59ef2048499beb821c76f7871b6 -EBUILD glibc-2.25-r11.ebuild 5010 BLAKE2B 836068daa3da6df776040c18431d293217485c5c1435d634b9f25a183e216979f1b7e801da404f09bffc3d41e6e8b29997047fa92864d128cf2ef8eb3cc123a0 SHA512 ba04dd938a024313f52e719a4f3c34d1bd8c0fe76b98401b404132c62d69c5016a506314eebeb2d90845cd0e316c7c1e868edfac9e2e5da9978893b818e43359 +EBUILD glibc-2.25-r11.ebuild 5006 BLAKE2B 24cf8028343c3d32e519dd008e481affe3bf5b29f378f61ef29fad9aaacdd8526b94ad6ad4da7b1a5877f703adf643df18083099b4588590fa329a81e859c512 SHA512 b1821bbfe6b38aaf295fc0300eb2e30669530ec8c401541cc5a9ccb9eccf765f84846b12d870a6a34c7e6c6f78c63d80ffc7f29a901591d66dd2f6017c4b8006 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260 -EBUILD glibc-2.26-r6.ebuild 25293 BLAKE2B a4d24330928efa7ec0d352234b52f6c9308f77fd99c6a79791879736b9025f07eaa0e804bd213cf8ed9847331c12de5d27f9af12ef340e4606afa56fdb0862f3 SHA512 6bac91c1a7cb83f226da7f7ff13b81ba8c57a97d40a843a96cd5a7e054ea58a564bbd4a3a592207b7e8098a2fffef0530278d5ab02fa75154a844974c75d90b2 -EBUILD glibc-2.27-r1.ebuild 40791 BLAKE2B ee1656ab7707dbc812fddc1060ba6a0cdf529a3c1e71e6f985a1eb4bbf16265c733e649278c3dcd23ed27e04f0f6f32fb243881a92c1c60707fd2a7e96733078 SHA512 4c49953d1cf239f46ac0c00e604e3ece8c8ca45d74228da3a06652693058c0b08d994811d011e7903bfca886a8f0ba0ae8574c460dc0d0e29d747aacef28b150 -EBUILD glibc-9999.ebuild 40790 BLAKE2B 141248ab2c01749242e8b35f008977912072d44b9c02a79eed597a7c14ec1e31ae5495d27ab9a5f59d72e70a536298372aa9c6ee7989920a1764d38418d94fb5 SHA512 85def3036f12300d55f17e7e7ebd48a6661de8454f2adefef75ceb15cc07024abf263355fe37e9eeaa6e5770989ea47e73a7e8d20bd49803c29313b004710ae3 +EBUILD glibc-2.26-r6.ebuild 25614 BLAKE2B 32bd3f11186c7f5619a7c83358cd5e416bc9c4ff6f6355ab9f65d68e94fefad99557bc993033a711fbea3f402c898ddcd494ecbc3c10f5e0c8dacdfce632b8e0 SHA512 256bbd3e1a5c4aaee844e4da88a0851608ec75fe7d1d10486849be57d14a202e4d10904873cdae565ae9ac216607072f765d18967007a0d16ea5f2103a76b20c +EBUILD glibc-2.27-r1.ebuild 41470 BLAKE2B dab4fac2db522600d912c5ea96ad100c579759860112d7007582d2ddbc4a204661b82d93af098663bcbebab9f1eb836e6d5018de32c3ad0cf5f5e21e6e566343 SHA512 f1c0cd78e710d838c93c5ae623bcb8b9172c72931dba9e6ba2b57b09c1d57aedf448d637a48759fe7c3ef04287b09887a31b96e78fd7a5aad4a641de63be6ca3 +EBUILD glibc-9999.ebuild 41469 BLAKE2B 51e18c80d93e4509f78f149da89be642dcfc7046b9e5d02770d2df3ca0e06f4ac278f7c41b8c587851ac20e5a1d0ed101ffd8e88d1eaa71ef5ba7daef1dce959 SHA512 0639891383ac3496df2e6e46d33ffbfd3c3bb7008731892b1c3d3b146e486e53cbb9537d551d2930d6d0b7b7d0a8c41ed5364c51b2c50f5216a89f2f2a91714f MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild index 6a73626ae9ca..ac21ef496d39 100644 --- a/sys-libs/glibc/glibc-2.25-r11.ebuild +++ b/sys-libs/glibc/glibc-2.25-r11.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="https://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" diff --git a/sys-libs/glibc/glibc-2.26-r6.ebuild b/sys-libs/glibc/glibc-2.26-r6.ebuild index 2729cf8d6ebe..0922ffb404fd 100644 --- a/sys-libs/glibc/glibc-2.26-r6.ebuild +++ b/sys-libs/glibc/glibc-2.26-r6.ebuild @@ -532,11 +532,20 @@ glibc_headers_configure() { # Nothing is compiled here which would affect the headers for the target. # So forcing CC/CFLAGS is sane. + local headers_only_CC=$(tc-getBUILD_CC) + local headers_only_CFLAGS="-O1 -pipe" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE" + local headers_only_LDFLAGS="" set -- "${S}"/configure "${myconf[@]}" - echo "$@" - CC="$(tc-getBUILD_CC)" \ - CFLAGS="-O1 -pipe" \ - CPPFLAGS="-U_FORTIFY_SOURCE" \ + echo \ + "CC=${headers_only_CC}" \ + "CFLAGS=${headers_only_CFLAGS}" \ + "CPPFLAGS=${headers_only_CPPFLAGS}" \ + "LDFLAGS=${headers_only_LDFLAGS}" \ + "$@" + CC=${headers_only_CC} \ + CFLAGS=${headers_only_CFLAGS} \ + CPPFLAGS=${headers_only_CPPFLAGS} \ LDFLAGS="" \ "$@" || die "failed to configure glibc" } diff --git a/sys-libs/glibc/glibc-2.27-r1.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild index aa1b179ab4b1..b281c00fac39 100644 --- a/sys-libs/glibc/glibc-2.27-r1.ebuild +++ b/sys-libs/glibc/glibc-2.27-r1.ebuild @@ -450,12 +450,20 @@ setup_env() { # and fall back on CFLAGS. local VAR=CFLAGS_${CTARGET//[-.]/_} CFLAGS=${!VAR-${CFLAGS}} + einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}" fi setup_flags export ABI=${ABI:-${DEFAULT_ABI:-default}} + if use headers-only ; then + # Avoid mixing host's CC and target's CFLAGS_${ABI}: + # At this bootstrap stage we have only binutils for + # target but not compiler yet. + einfo "Skip CC ABI injection. We can't use (cross-)compiler yet." + return 0 + fi local VAR=CFLAGS_${ABI} # We need to export CFLAGS with abi information in them because glibc's # configure script checks CFLAGS for some targets (like mips). Keep @@ -463,6 +471,7 @@ setup_env() { # top of each other. : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})} export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" } foreach_abi() { @@ -1022,11 +1031,20 @@ glibc_headers_configure() { # Nothing is compiled here which would affect the headers for the target. # So forcing CC/CFLAGS is sane. + local headers_only_CC=$(tc-getBUILD_CC) + local headers_only_CFLAGS="-O1 -pipe" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE" + local headers_only_LDFLAGS="" set -- "${S}"/configure "${myconf[@]}" - echo "$@" - CC="$(tc-getBUILD_CC)" \ - CFLAGS="-O1 -pipe" \ - CPPFLAGS="-U_FORTIFY_SOURCE" \ + echo \ + "CC=${headers_only_CC}" \ + "CFLAGS=${headers_only_CFLAGS}" \ + "CPPFLAGS=${headers_only_CPPFLAGS}" \ + "LDFLAGS=${headers_only_LDFLAGS}" \ + "$@" + CC=${headers_only_CC} \ + CFLAGS=${headers_only_CFLAGS} \ + CPPFLAGS=${headers_only_CPPFLAGS} \ LDFLAGS="" \ "$@" || die "failed to configure glibc" } diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index a978eaf1970b..17f8cdafed54 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -450,12 +450,20 @@ setup_env() { # and fall back on CFLAGS. local VAR=CFLAGS_${CTARGET//[-.]/_} CFLAGS=${!VAR-${CFLAGS}} + einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}" fi setup_flags export ABI=${ABI:-${DEFAULT_ABI:-default}} + if use headers-only ; then + # Avoid mixing host's CC and target's CFLAGS_${ABI}: + # At this bootstrap stage we have only binutils for + # target but not compiler yet. + einfo "Skip CC ABI injection. We can't use (cross-)compiler yet." + return 0 + fi local VAR=CFLAGS_${ABI} # We need to export CFLAGS with abi information in them because glibc's # configure script checks CFLAGS for some targets (like mips). Keep @@ -463,6 +471,7 @@ setup_env() { # top of each other. : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})} export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" } foreach_abi() { @@ -1022,11 +1031,20 @@ glibc_headers_configure() { # Nothing is compiled here which would affect the headers for the target. # So forcing CC/CFLAGS is sane. + local headers_only_CC=$(tc-getBUILD_CC) + local headers_only_CFLAGS="-O1 -pipe" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE" + local headers_only_LDFLAGS="" set -- "${S}"/configure "${myconf[@]}" - echo "$@" - CC="$(tc-getBUILD_CC)" \ - CFLAGS="-O1 -pipe" \ - CPPFLAGS="-U_FORTIFY_SOURCE" \ + echo \ + "CC=${headers_only_CC}" \ + "CFLAGS=${headers_only_CFLAGS}" \ + "CPPFLAGS=${headers_only_CPPFLAGS}" \ + "LDFLAGS=${headers_only_LDFLAGS}" \ + "$@" + CC=${headers_only_CC} \ + CFLAGS=${headers_only_CFLAGS} \ + CPPFLAGS=${headers_only_CPPFLAGS} \ LDFLAGS="" \ "$@" || die "failed to configure glibc" } -- cgit v1.2.3