Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_compile.eblit
Date: Thu, 30 Sep 2010 06:28:05
Message-Id: 20100930062759.D236620051@flycatcher.gentoo.org
1 vapier 10/09/30 06:27:59
2
3 Modified: src_compile.eblit
4 Log:
5 standardize output a bit
6
7 Revision Changes Path
8 1.14 sys-libs/glibc/files/eblits/src_compile.eblit
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.14&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.14&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.13&r2=1.14
13
14 Index: src_compile.eblit
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v
17 retrieving revision 1.13
18 retrieving revision 1.14
19 diff -u -r1.13 -r1.14
20 --- src_compile.eblit 18 Sep 2010 09:55:18 -0000 1.13
21 +++ src_compile.eblit 30 Sep 2010 06:27:59 -0000 1.14
22 @@ -1,10 +1,12 @@
23 # Copyright 1999-2010 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.13 2010/09/18 09:55:18 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.14 2010/09/30 06:27:59 vapier Exp $
27
28 glibc_do_configure() {
29 local myconf
30
31 + einfo "Configuring GLIBC for $1"
32 +
33 # set addons
34 pushd "${S}" > /dev/null
35 local ADDONS=$(echo */configure | sed \
36 @@ -89,13 +91,10 @@
37 # since the glibc build will re-run configure on itself
38 export libc_cv_slibdir=/$(get_libdir)
39
40 - export CC=$(tc-getCC ${CTARGET})
41 - einfo "Set CC to ${CC}"
42 -
43 local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
44 mkdir -p "${GBUILDDIR}"
45 cd "${GBUILDDIR}"
46 - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
47 + echo "${S}"/configure ${myconf}
48 "${S}"/configure ${myconf} || die "failed to configure glibc"
49
50 # since we'll be punting them for cross-compilers, and they can cause
51 @@ -109,18 +108,18 @@
52 for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
53 einfo " $(printf '%15s' ${v}:) ${!v}"
54 done
55 + export CC=$(tc-getCC ${CTARGET})
56 + einfo " $(printf '%15s' 'Manual CC:') ${CC}"
57 echo
58
59 if want_linuxthreads ; then
60 glibc_do_configure linuxthreads
61 - einfo "Building GLIBC with linuxthreads..."
62 emake || die "make for ${ABI} failed"
63 fi
64 if want_nptl ; then
65 # ... and then do the optional nptl build
66 unset LD_ASSUME_KERNEL
67 glibc_do_configure nptl
68 - einfo "Building GLIBC with NPTL..."
69 emake || die "make for ${ABI} failed"
70 fi
71 }