diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-03-23 18:06:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-23 18:06:18 +0000 |
| commit | 12b570948c80a352582d6aac9254a724e9e9d940 (patch) | |
| tree | 0c9a8e4aab53bddb2755c18702cc903fdb384e6b /sys-libs/glibc/files | |
| parent | ia64 stable wrt #214246 (diff) | |
| download | historical-12b570948c80a352582d6aac9254a724e9e9d940.tar.gz historical-12b570948c80a352582d6aac9254a724e9e9d940.tar.bz2 historical-12b570948c80a352582d6aac9254a724e9e9d940.zip | |
No need to generate multilib headers anymore with latest glibc #191088. Grab some queue.h updates from FreeBSD #201979. Disable (for now) CFI stuff on x86_64/x86 to workaround a bug in gcc #202055. Fix from upstream for building with newer binutils #209629. Fix pthread_join on hppa #213829. Make sure to force latest kernel headers on hppa and increase testing timeout #214003.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'sys-libs/glibc/files')
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_install.eblit | 19 | ||||
| -rw-r--r-- | sys-libs/glibc/files/eblits/src_test.eblit | 5 |
2 files changed, 14 insertions, 10 deletions
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index ce01e44e07cb..aa3e8a51c8d9 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.4 2007/12/10 01:29:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.5 2008/03/23 18:06:18 vapier Exp $ toolchain-glibc_src_install() { # These should not be set, else the @@ -19,16 +19,13 @@ toolchain-glibc_src_install() { if want_linuxthreads ; then cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS}" \ - install_root="${install_root}" \ - install || die else # nptlonly cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS}" \ - install_root="${install_root}" \ - install || die fi + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root="${install_root}" \ + install || die if is_crosscompile ; then # punt all the junk not needed by a cross-compiler @@ -85,8 +82,12 @@ toolchain-glibc_src_install() { # Some things want this, notably ash. dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) + # Handle includes for different ABIs if glibc itself doesn't do it + # XXX: curr glibc should finally handle all of them correctly + #case $(tc-arch) in + # amd64|mips|ppc|s390) ;; + # *) prep_ml_includes $(alt_headers) ;; + #esac # When cross-compiling for a non-multilib setup, make sure we have # lib and a proper symlink setup diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit index 1e1156280b39..0d733a3519d0 100644 --- a/sys-libs/glibc/files/eblits/src_test.eblit +++ b/sys-libs/glibc/files/eblits/src_test.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.2 2007/08/06 09:50:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.3 2008/03/23 18:06:18 vapier Exp $ toolchain-glibc_src_test() { cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1" @@ -17,6 +17,9 @@ eblit-glibc-src_test() { setup_env + # give tests more time to complete + export TIMEOUTFACTOR=5 + if [[ -z ${OABI} ]] && has_multilib_profile ; then OABI=${ABI} einfo "Testing multilib glibc for ABIs: $(get_install_abis)" |