| 1 |
commit: 956411cb2fb0c68d0982343f9bbaa4ebb082c2c2 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 4 23:39:21 2018 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 4 23:40:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956411cb |
| 7 |
|
| 8 |
sys-libs/glibc: Drop glibc-2.18 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
sys-libs/glibc/Manifest | 2 - |
| 13 |
sys-libs/glibc/glibc-2.18-r1.ebuild | 164 ------------------------------------ |
| 14 |
2 files changed, 166 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
| 17 |
index b2dbe0f7f4f..a7b01a7e57f 100644 |
| 18 |
--- a/sys-libs/glibc/Manifest |
| 19 |
+++ b/sys-libs/glibc/Manifest |
| 20 |
@@ -1,7 +1,5 @@ |
| 21 |
DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d9a376ee8ca02f119fe9d653311cbe4d2b7b93aec2290adac3be271be19a7fdedae2e11e4b6e32360184e557204e100ad64357f5575d4b SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269 |
| 22 |
DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853 |
| 23 |
-DIST glibc-2.18-patches-4.tar.bz2 95165 BLAKE2B 70280e0f5fd0b1ee13cd0464aafaa9c9324528d0bee8024e6529d67d908991012066db6d8257b66983a1f52e32b3aad7718612fdab9ea199fef845db93347168 SHA512 d881c9c5fe32b967694d4ca5185ff5ffc964449f2ed49fd062e5d57a3c6d9f16eef2f591d2d8e98a1a95a6487f3436ef031839ed8766fd085404b288340b7933 |
| 24 |
-DIST glibc-2.18.tar.xz 11150148 BLAKE2B 7848a5a50abedbd17085e05b6f6835959adb5e55a424d95fa8a49eeec999a6dd81a9382db85ef7e852ef1d7743c5d312dccbf42024e95edf0e802eb32928dfe5 SHA512 27218d2e7dd3bf3908d7af171c490933680e958c579ebd27b43b661e223fd5de2219cc1cf699170405280808c84de476d0ad86dbba35a488ef404e9438552327 |
| 25 |
DIST glibc-2.19-patches-3.tar.bz2 80664 BLAKE2B fb348c711941c1bd4dadd905e172dc4f239d8b63af1a1d14dcf4ec45c504bd47e10e9b24b38f9e01796016f2e97caeeb693213ae08147274ed0a4d9501293be0 SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0 |
| 26 |
DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e |
| 27 |
DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d |
| 28 |
|
| 29 |
diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild |
| 30 |
deleted file mode 100644 |
| 31 |
index d699096c66f..00000000000 |
| 32 |
--- a/sys-libs/glibc/glibc-2.18-r1.ebuild |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,164 +0,0 @@ |
| 35 |
-# Copyright 1999-2018 Gentoo Foundation |
| 36 |
-# Distributed under the terms of the GNU General Public License v2 |
| 37 |
- |
| 38 |
-EAPI=0 |
| 39 |
- |
| 40 |
-inherit toolchain-glibc |
| 41 |
- |
| 42 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
| 43 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
| 44 |
- |
| 45 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
| 46 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 47 |
-RESTRICT="strip" # strip ourself #46186 |
| 48 |
-EMULTILIB_PKG="true" |
| 49 |
- |
| 50 |
-# Configuration variables |
| 51 |
-RELEASE_VER="" |
| 52 |
-case ${PV} in |
| 53 |
-9999*) |
| 54 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
| 55 |
- EGIT_SOURCEDIRS="${S}" |
| 56 |
- inherit git-2 |
| 57 |
- ;; |
| 58 |
-*) |
| 59 |
- RELEASE_VER=${PV} |
| 60 |
- ;; |
| 61 |
-esac |
| 62 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
| 63 |
-PATCH_VER="4" # Gentoo patchset |
| 64 |
-NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires |
| 65 |
- |
| 66 |
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" |
| 67 |
- |
| 68 |
-# Here's how the cross-compile logic breaks down ... |
| 69 |
-# CTARGET - machine that will target the binaries |
| 70 |
-# CHOST - machine that will host the binaries |
| 71 |
-# CBUILD - machine that will build the binaries |
| 72 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
| 73 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
| 74 |
-# CBUILD = CHOST = CTARGET - native build/install |
| 75 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
| 76 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
| 77 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
| 78 |
-# For install paths: |
| 79 |
-# CHOST = CTARGET - install into / |
| 80 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
| 81 |
- |
| 82 |
-export CBUILD=${CBUILD:-${CHOST}} |
| 83 |
-export CTARGET=${CTARGET:-${CHOST}} |
| 84 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 85 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
| 86 |
- export CTARGET=${CATEGORY#cross-} |
| 87 |
- fi |
| 88 |
-fi |
| 89 |
- |
| 90 |
-[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} |
| 91 |
- |
| 92 |
-is_crosscompile() { |
| 93 |
- [[ ${CHOST} != ${CTARGET} ]] |
| 94 |
-} |
| 95 |
- |
| 96 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
| 97 |
-# Everyone knows 2.2 > 0, duh. |
| 98 |
-SLOT="2.2" |
| 99 |
- |
| 100 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
| 101 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
| 102 |
-DEPEND=">=app-misc/pax-utils-0.1.10 |
| 103 |
- !<sys-apps/sandbox-1.6 |
| 104 |
- !<sys-apps/portage-2.1.2 |
| 105 |
- selinux? ( sys-libs/libselinux )" |
| 106 |
-RDEPEND="!sys-kernel/ps3-sources |
| 107 |
- selinux? ( sys-libs/libselinux ) |
| 108 |
- !sys-libs/nss-db" |
| 109 |
- |
| 110 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
| 111 |
- DEPEND+=" !headers-only? ( |
| 112 |
- >=${CATEGORY}/binutils-2.20 |
| 113 |
- >=${CATEGORY}/gcc-4.3 |
| 114 |
- )" |
| 115 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
| 116 |
-else |
| 117 |
- DEPEND+=" |
| 118 |
- >=sys-devel/binutils-2.20 |
| 119 |
- >=sys-devel/gcc-4.3 |
| 120 |
- virtual/os-headers |
| 121 |
- !vanilla? ( >=sys-libs/timezone-data-2012c )" |
| 122 |
- RDEPEND+=" |
| 123 |
- vanilla? ( !sys-libs/timezone-data ) |
| 124 |
- !vanilla? ( sys-libs/timezone-data )" |
| 125 |
-fi |
| 126 |
- |
| 127 |
-upstream_uris() { |
| 128 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
| 129 |
-} |
| 130 |
-gentoo_uris() { |
| 131 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 132 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
| 133 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 134 |
-} |
| 135 |
-SRC_URI=$( |
| 136 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
| 137 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
| 138 |
-) |
| 139 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
| 140 |
- |
| 141 |
-src_unpack() { |
| 142 |
- GLIBC_PATCH_EXCLUDE+=" 00_all_0012-mips-add-clock_-g-s-ettime-symbol-compat-hacks.patch" #456912 #481438 |
| 143 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
| 144 |
- |
| 145 |
- toolchain-glibc_src_unpack |
| 146 |
- |
| 147 |
- if use hardened ; then |
| 148 |
- cd "${S}" |
| 149 |
- einfo "Patching to get working PIE binaries on PIE (hardened) platforms" |
| 150 |
- tc-enables-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch |
| 151 |
- epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch |
| 152 |
- epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch |
| 153 |
- |
| 154 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
| 155 |
- cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \ |
| 156 |
- debug/stack_chk_fail.c || die |
| 157 |
- cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \ |
| 158 |
- debug/chk_fail.c || die |
| 159 |
- |
| 160 |
- if use debug ; then |
| 161 |
- # When using Hardened Gentoo stack handler, have smashes dump core for |
| 162 |
- # analysis - debug only, as core could be an information leak |
| 163 |
- # (paranoia). |
| 164 |
- sed -i \ |
| 165 |
- -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
| 166 |
- debug/Makefile \ |
| 167 |
- || die "Failed to modify debug/Makefile for debug stack handler" |
| 168 |
- sed -i \ |
| 169 |
- -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
| 170 |
- debug/Makefile \ |
| 171 |
- || die "Failed to modify debug/Makefile for debug fortify handler" |
| 172 |
- fi |
| 173 |
- |
| 174 |
- # Build nscd with ssp-all |
| 175 |
- sed -i \ |
| 176 |
- -e 's:-fstack-protector$:-fstack-protector-all:' \ |
| 177 |
- nscd/Makefile \ |
| 178 |
- || die "Failed to ensure nscd builds with ssp-all" |
| 179 |
- fi |
| 180 |
-} |
| 181 |
- |
| 182 |
-pkg_preinst() { |
| 183 |
- toolchain-glibc_pkg_preinst |
| 184 |
- |
| 185 |
- if [[ ${CTARGET} == arm* ]] ; then |
| 186 |
- # Backwards compat support for renaming hardfp ldsos #417287 |
| 187 |
- local oldso='/lib/ld-linux.so.3' |
| 188 |
- local nldso='/lib/ld-linux-armhf.so.3' |
| 189 |
- if [[ -e ${D}${nldso} ]] ; then |
| 190 |
- if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then |
| 191 |
- ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." |
| 192 |
- ewarn "Please rebuild all packages using this old ldso as compat" |
| 193 |
- ewarn "support will be dropped in the future." |
| 194 |
- ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" |
| 195 |
- fi |
| 196 |
- fi |
| 197 |
- fi |
| 198 |
-} |
Archives