diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-01-24 00:41:36 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-24 00:41:36 +0000 |
commit | 381f5ae9f00446e8141695ecc5fe9beca1f04647 (patch) | |
tree | 21e3f81e86dc1623a384c94057526c9ce58fdbd2 /sys-libs/glibc | |
parent | Stable on amd64. Bug #120069. (diff) | |
download | historical-381f5ae9f00446e8141695ecc5fe9beca1f04647.tar.gz historical-381f5ae9f00446e8141695ecc5fe9beca1f04647.tar.bz2 historical-381f5ae9f00446e8141695ecc5fe9beca1f04647.zip |
Define alt_build_headers for the --with-headers option and for checking for nptl support #114923.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r-- | sys-libs/glibc/ChangeLog | 8 | ||||
-rw-r--r-- | sys-libs/glibc/Manifest | 22 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r1.ebuild | 15 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r2.ebuild | 15 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r3.ebuild | 15 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.5.ebuild | 17 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.6-r1.ebuild | 15 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.6-r2.ebuild | 15 | ||||
-rw-r--r-- | sys-libs/glibc/glibc-2.3.6.ebuild | 15 |
9 files changed, 89 insertions, 48 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 130c70063623..560bf457c0bd 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.424 2006/01/18 21:09:10 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.425 2006/01/24 00:41:36 vapier Exp $ + + 24 Jan 2006; Mike Frysinger <vapier@gentoo.org> glibc-2.3.5.ebuild, + glibc-2.3.5-r1.ebuild, glibc-2.3.5-r2.ebuild, glibc-2.3.5-r3.ebuild, + glibc-2.3.6.ebuild, glibc-2.3.6-r1.ebuild, glibc-2.3.6-r2.ebuild: + Define alt_build_headers for the --with-headers option and for checking for + nptl support #114923. 18 Jan 2006; Mark Loeser <halcy0n@gentoo.org> files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch, diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index b400d488b16b..b1056b12a9f6 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 66ec8aaf696bb217a0f8668275cc1578 ChangeLog 88731 +MD5 2d2fb232be126e8c062500540f0674cc ChangeLog 89042 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433 MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053 @@ -131,18 +131,18 @@ MD5 e67d64767c058da9a992f207155d0650 glibc-2.3.4.20040808-r1.ebuild 27869 MD5 c9960e58c934162d756bc22d4e0047a9 glibc-2.3.4.20041102-r1.ebuild 34434 MD5 d0501b95beefec42d574b34ef0d0cecb glibc-2.3.4.20041102-r2.ebuild 41390 MD5 dcc9e5194707e88476804f3a43d65517 glibc-2.3.4.20050125-r1.ebuild 39583 -MD5 44f39e42f8ba51393ae4a1d9fc439732 glibc-2.3.5-r1.ebuild 40989 -MD5 8f1d6087f92a4a68c8b619349383b813 glibc-2.3.5-r2.ebuild 39315 -MD5 16f4e4474f9155a287345ec32a83f817 glibc-2.3.5-r3.ebuild 39393 -MD5 23af2c26bf05b7b899e05875ebc22af5 glibc-2.3.5.ebuild 40252 -MD5 6f39cf067f6c5e2c8facfedccbd0eae7 glibc-2.3.6-r1.ebuild 42256 -MD5 fcf35936d27b3ffcbca4880f6ea48656 glibc-2.3.6-r2.ebuild 42765 -MD5 76dd43d100b7c127d5ca51e981e0e768 glibc-2.3.6.ebuild 40584 +MD5 7eff2c955b8ecd4e63c4e5d159144203 glibc-2.3.5-r1.ebuild 41103 +MD5 da2e1d110594a8d29527eb3bbd7a645d glibc-2.3.5-r2.ebuild 39429 +MD5 88e9a837d0efc7a083e70de9f70ec65c glibc-2.3.5-r3.ebuild 39507 +MD5 30b7b2154ef88abb20edccf224def10f glibc-2.3.5.ebuild 40366 +MD5 309f0973518bd1f7614c61f9fa00472e glibc-2.3.6-r1.ebuild 42369 +MD5 1c2d19969ce336ca85fd771d54f551a8 glibc-2.3.6-r2.ebuild 42878 +MD5 5795f4dfc7b83202112dd0985fac5b36 glibc-2.3.6.ebuild 40697 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDzq6FCRZPokWLroQRAnefAJ4kw1FDpLi3bNFJ0ENwXSCo0wJB8gCggsBL -RMDnjVIZrBJlHSKwX0aSGm4= -=lsl0 +iD8DBQFD1XhY2+ySkm8kpY0RApFoAJ0aq8lEzeW4YZQOHsQQyMeg2/wsfgCfXD9Y +gIzxL0TGm/qroSvw29Jm4sM= +=iBKo -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild index 8e46a9edf3be..c3bfe6326d01 100644 --- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.49 2006/01/14 20:12:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.50 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -567,6 +567,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -665,7 +672,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -881,8 +888,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -890,7 +895,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild index de878b4575ee..aad9adf4caef 100644 --- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.24 2006/01/14 20:12:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.25 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -555,6 +555,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -672,7 +679,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -888,8 +895,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -897,7 +902,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild index 4f3f97616db4..83daa0420b77 100644 --- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.15 2006/01/15 23:36:30 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.16 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -560,6 +560,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -677,7 +684,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -893,8 +900,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -902,7 +907,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild index 2135ff64f1b7..8acb461ec8b2 100644 --- a/sys-libs/glibc/glibc-2.3.5.ebuild +++ b/sys-libs/glibc/glibc-2.3.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.50 2005/12/17 00:46:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.51 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -593,6 +593,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -695,7 +702,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -923,8 +930,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -932,7 +937,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} --disable-profile --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild index ef0b27d63b42..5ce7108b87e7 100644 --- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.13 2006/01/18 21:09:11 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r1.ebuild,v 1.14 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -258,8 +258,6 @@ toolchain-glibc_headers_compile() { cd "${GBUILDDIR}" # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} local myconf="--disable-sanity-checks --enable-hacker-mode" myconf="${myconf} --enable-add-ons=linuxthreads @@ -267,7 +265,7 @@ toolchain-glibc_headers_compile() { --enable-bind-now --build=${CBUILD_OPT:-${CBUILD}} --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info @@ -618,6 +616,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -735,7 +740,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild index 059a7f101660..821349f3cfae 100644 --- a/sys-libs/glibc/glibc-2.3.6-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.10 2006/01/18 21:09:11 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r2.ebuild,v 1.11 2006/01/24 00:41:36 vapier Exp $ # TODO: # - fix warning from glibc build system: @@ -626,6 +626,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -743,7 +750,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -953,8 +960,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -962,7 +967,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild index 9752af37c910..e7562d2ad3b3 100644 --- a/sys-libs/glibc/glibc-2.3.6.ebuild +++ b/sys-libs/glibc/glibc-2.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.14 2006/01/18 21:09:11 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6.ebuild,v 1.15 2006/01/24 00:41:36 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -573,6 +573,13 @@ alt_headers() { fi echo "${ALT_HEADERS}" } +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS=$(alt_headers) + tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}${headersloc} + fi + echo "${ALT_BUILD_HEADERS}" +} alt_prefix() { if is_crosscompile ; then @@ -690,7 +697,7 @@ setup_flags() { } check_kheader_version() { - local header="${ROOT}$(alt_headers)/linux/version.h" + local header="$(alt_build_headers)/linux/version.h" [[ -z $1 ]] && return 1 @@ -906,8 +913,6 @@ glibc_do_configure() { fi # Pick out the correct location for build headers - local headersloc=$(alt_headers) - tc-is-cross-compiler && headersloc=${ROOT}${headersloc} myconf="${myconf} --without-cvs --enable-bind-now @@ -915,7 +920,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) --without-gd - --with-headers=${headersloc} + --with-headers=$(alt_build_headers) --prefix=$(alt_prefix) --mandir=$(alt_prefix)/share/man --infodir=$(alt_prefix)/share/info |