* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit src_unpack.eblit src_compile.eblit
@ 2012-12-28 19:00 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2012-12-28 19:00 UTC (permalink / raw
To: gentoo-commits
vapier 12/12/28 19:00:51
Modified: common.eblit src_unpack.eblit src_compile.eblit
Log:
Use --with-{bugurl,pkgversion} with glibc-2.17+.
(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.29 sys-libs/glibc/files/eblits/common.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.28&r2=1.29
Index: common.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- common.eblit 10 Aug 2012 19:44:47 -0000 1.28
+++ common.eblit 28 Dec 2012 19:00:51 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.28 2012/08/10 19:44:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.29 2012/12/28 19:00:51 vapier Exp $
alt_prefix() {
is_crosscompile && echo /usr/${CTARGET}
@@ -289,3 +289,11 @@
just_headers() {
is_crosscompile && use crosscompile_opts_headers-only
}
+
+glibc_banner() {
+ local b="Gentoo ${PVR}"
+ [[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}"
+ [[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}"
+ [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+ echo "${b}"
+}
1.20 sys-libs/glibc/files/eblits/src_unpack.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit?r1=1.19&r2=1.20
Index: src_unpack.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- src_unpack.eblit 11 Nov 2012 07:24:55 -0000 1.19
+++ src_unpack.eblit 28 Dec 2012 19:00:51 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.19 2012/11/11 07:24:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.20 2012/12/28 19:00:51 vapier Exp $
int_to_KV() {
local version=$1 major minor micro
@@ -134,9 +134,10 @@
# tag, glibc is it
cd "${S}"
- [[ -e csu/Banner ]] && die "need new banner location"
- [[ -n ${SNAP_VER} ]] && echo "Gentoo snapshot ${SNAP_VER}" >> csu/Banner
- [[ -n ${BRANCH_UPDATE} ]] && echo "Gentoo branch ${BRANCH_UPDATE}" >> csu/Banner
+ if ! version_is_at_least 2.17 ; then
+ [[ -e csu/Banner ]] && die "need new banner location"
+ glibc_banner > csu/Banner
+ fi
if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then
cd "${S}"
EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \
@@ -144,7 +145,6 @@
EPATCH_SUFFIX="patch" \
ARCH=$(tc-arch) \
epatch "${WORKDIR}"/patches
- echo "Gentoo patchset ${PATCH_VER}" >> csu/Banner
fi
if just_headers ; then
1.31 sys-libs/glibc/files/eblits/src_compile.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.30&r2=1.31
Index: src_compile.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- src_compile.eblit 25 Dec 2012 20:08:39 -0000 1.30
+++ src_compile.eblit 28 Dec 2012 19:00:51 -0000 1.31
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.30 2012/12/25 20:08:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.31 2012/12/28 19:00:51 vapier Exp $
glibc_do_configure() {
- local myconf
+ local myconf=()
einfo "Configuring GLIBC for $1"
@@ -19,32 +19,32 @@
[[ -d ports ]] && ADDONS="${ADDONS},ports"
popd > /dev/null
- myconf="${myconf} $(use_enable hardened stackguard-randomization)"
+ myconf+=( $(use_enable hardened stackguard-randomization) )
if has_version '<sys-libs/glibc-2.13' ; then
- myconf="${myconf} --enable-old-ssp-compat"
+ myconf+=( --enable-old-ssp-compat )
fi
- [[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf="${myconf} --without-fp"
+ [[ ${CTARGET//_/-} == *-softfloat-* ]] && myconf+=( --without-fp )
if [[ $1 == "linuxthreads" ]] ; then
if want_tls ; then
- myconf="${myconf} --with-tls"
+ myconf+=( --with-tls )
if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then
- myconf="${myconf} --without-__thread"
+ myconf+=( --without-__thread )
else
- myconf="${myconf} --with-__thread"
+ myconf+=( --with-__thread )
fi
else
- myconf="${myconf} --without-tls --without-__thread"
+ myconf+=( --without-tls --without-__thread )
fi
- myconf="${myconf} --disable-sanity-checks"
- myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}"
- myconf="${myconf} --enable-kernel=${LT_KER_VER}"
+ myconf+=( --disable-sanity-checks )
+ myconf+=( --enable-add-ons="linuxthreads${ADDONS}" )
+ myconf+=( --enable-kernel=${LT_KER_VER} )
elif [[ $1 == "nptl" ]] ; then
- myconf="${myconf} --enable-add-ons=nptl${ADDONS}"
- myconf="${myconf} --enable-kernel=${NPTL_KERN_VER}"
+ myconf+=( --enable-add-ons="nptl${ADDONS}" )
+ myconf+=( --enable-kernel=${NPTL_KERN_VER} )
else
die "invalid pthread option"
fi
@@ -56,18 +56,18 @@
if ! is_crosscompile && use selinux ; then
if use multilib || has_multilib_profile ; then
if is_final_abi ; then
- myconf="${myconf} --with-selinux"
+ myconf+=( --with-selinux )
else
- myconf="${myconf} --without-selinux"
+ myconf+=( --without-selinux )
fi
else
- myconf="${myconf} --with-selinux"
+ myconf+=( --with-selinux )
fi
else
- myconf="${myconf} --without-selinux"
+ myconf+=( --without-selinux )
fi
- myconf="${myconf}
+ myconf+=(
--without-cvs
--enable-bind-now
--build=${CBUILD_OPT:-${CBUILD}}
@@ -80,10 +80,13 @@
--mandir=/usr/share/man
--infodir=/usr/share/info
--libexecdir=/usr/$(get_libdir)/misc/glibc
+ --with-bugurl=http://bugs.gentoo.org/
+ --with-pkgversion="$(glibc_banner)"
$(use_multiarch || echo --disable-multi-arch)
--enable-obsolete-rpc
$(in_iuse systemtap && use_enable systemtap)
- ${EXTRA_ECONF}"
+ ${EXTRA_ECONF}
+ )
# There is no configure option for this and we need to export it
# since the glibc build will re-run configure on itself
@@ -97,8 +100,9 @@
local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1
mkdir -p "${GBUILDDIR}"
cd "${GBUILDDIR}"
- echo "${S}"/configure ${myconf}
- "${S}"/configure ${myconf} || die "failed to configure glibc"
+ set -- "${S}"/configure "${myconf[@]}"
+ echo "$@"
+ "$@" || die "failed to configure glibc"
# ia64 static cross-compilers are a pita in so much that they
# can't produce static ELFs (as the libgcc.a is broken). so
@@ -169,9 +173,11 @@
libc_cv_z_relro=yes
# Pick out the correct location for build headers
- local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"
+ local ports="" myconf=()
[[ -d ${S}/ports ]] && ports=",ports"
- myconf="${myconf}
+ myconf+=(
+ --disable-sanity-checks
+ --enable-hacker-mode
--enable-add-ons=nptl${ports}
--without-cvs
--enable-bind-now
@@ -179,17 +185,18 @@
--host=${CTARGET_OPT:-${CTARGET}}
--with-headers=$(alt_build_headers)
--prefix=/usr
- ${EXTRA_ECONF}"
+ ${EXTRA_ECONF}
+ )
# Nothing is compiled here which would affect the headers for the target.
# so forcing CC/CFLAGS is sane. unless you dont have `gcc`. then i
# dont care :p.
- echo "${S}"/configure ${myconf}
+ set -- "${S}"/configure "${myconf[@]}"
CC=gcc \
CFLAGS="-O1 -pipe" \
CPPFLAGS="-U_FORTIFY_SOURCE" \
LDFLAGS="" \
- "${S}"/configure ${myconf} || die "failed to configure glibc"
+ "$@" || die "failed to configure glibc"
}
eblit-glibc-src_compile() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-28 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-28 19:00 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit src_unpack.eblit src_compile.eblit Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox