| 1 |
vapier 07/10/22 17:10:10 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: glibc-2.7.ebuild |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
(Portage version: 2.1.3.15) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.559 sys-libs/glibc/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.559&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/ChangeLog?rev=1.559&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/ChangeLog?r1=1.558&r2=1.559 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v |
| 19 |
retrieving revision 1.558 |
| 20 |
retrieving revision 1.559 |
| 21 |
diff -u -r1.558 -r1.559 |
| 22 |
--- ChangeLog 17 Oct 2007 16:48:59 -0000 1.558 |
| 23 |
+++ ChangeLog 22 Oct 2007 17:10:09 -0000 1.559 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for sys-libs/glibc |
| 26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.558 2007/10/17 16:48:59 armin76 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.559 2007/10/22 17:10:09 vapier Exp $ |
| 29 |
+ |
| 30 |
+*glibc-2.7 (22 Oct 2007) |
| 31 |
+ |
| 32 |
+ 22 Oct 2007; Mike Frysinger <vapier@g.o> +glibc-2.7.ebuild: |
| 33 |
+ Version bump. |
| 34 |
|
| 35 |
17 Oct 2007; Raúl Porcel <armin76@g.o> glibc-2.6.1.ebuild: |
| 36 |
alpha/ia64/sparc stable wrt #195427 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 sys-libs/glibc/glibc-2.7.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/glibc-2.7.ebuild?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/glibc-2.7.ebuild?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: glibc-2.7.ebuild |
| 46 |
=================================================================== |
| 47 |
# Copyright 1999-2007 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.7.ebuild,v 1.1 2007/10/22 17:10:09 vapier Exp $ |
| 50 |
|
| 51 |
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib |
| 52 |
|
| 53 |
DESCRIPTION="GNU libc6 (also called glibc2) C library" |
| 54 |
HOMEPAGE="http://www.gnu.org/software/libc/libc.html" |
| 55 |
|
| 56 |
LICENSE="LGPL-2" |
| 57 |
#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 58 |
RESTRICT="strip" # strip ourself #46186 |
| 59 |
EMULTILIB_PKG="true" |
| 60 |
|
| 61 |
# Configuration variables |
| 62 |
RELEASE_VER=$(get_version_component_range 1-3) # major glibc version |
| 63 |
BRANCH_UPDATE=$(get_version_component_range 4) # upstream cvs snaps |
| 64 |
MANPAGE_VER="" # pregenerated manpages |
| 65 |
INFOPAGE_VER="" # pregenerated infopages |
| 66 |
PATCH_VER="1.0" # Gentoo patchset |
| 67 |
PATCH_GLIBC_VER=${RELEASE_VER} # glibc version in patchset |
| 68 |
PORTS_VER=${RELEASE_VER} # version of glibc ports addon |
| 69 |
LT_VER="" # version of linuxthreads addon |
| 70 |
NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires |
| 71 |
#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires |
| 72 |
|
| 73 |
[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER:-2.6.20} |
| 74 |
|
| 75 |
IUSE="debug nls hardened multilib selinux glibc-omitfp profile glibc-compat20 ${LT_VER:+nptl nptlonly}" |
| 76 |
S=${WORKDIR}/glibc-${RELEASE_VER} |
| 77 |
|
| 78 |
# Here's how the cross-compile logic breaks down ... |
| 79 |
# CTARGET - machine that will target the binaries |
| 80 |
# CHOST - machine that will host the binaries |
| 81 |
# CBUILD - machine that will build the binaries |
| 82 |
# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
| 83 |
# If CHOST != CBUILD, it means you want to cross-compile the libc. |
| 84 |
# CBUILD = CHOST = CTARGET - native build/install |
| 85 |
# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
| 86 |
# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
| 87 |
# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
| 88 |
# For install paths: |
| 89 |
# CHOST = CTARGET - install into / |
| 90 |
# CHOST != CTARGET - install into /usr/CTARGET/ |
| 91 |
|
| 92 |
export CBUILD=${CBUILD:-${CHOST}} |
| 93 |
export CTARGET=${CTARGET:-${CHOST}} |
| 94 |
if [[ ${CTARGET} == ${CHOST} ]] ; then |
| 95 |
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then |
| 96 |
export CTARGET=${CATEGORY/cross-} |
| 97 |
fi |
| 98 |
fi |
| 99 |
|
| 100 |
is_crosscompile() { |
| 101 |
[[ ${CHOST} != ${CTARGET} ]] |
| 102 |
} |
| 103 |
alt_libdir() { |
| 104 |
if is_crosscompile ; then |
| 105 |
echo /usr/${CTARGET}/$(get_libdir) |
| 106 |
else |
| 107 |
echo /$(get_libdir) |
| 108 |
fi |
| 109 |
} |
| 110 |
|
| 111 |
if is_crosscompile ; then |
| 112 |
SLOT="${CTARGET}-2.2" |
| 113 |
else |
| 114 |
# Why SLOT 2.2 you ask yourself while sippin your tea ? |
| 115 |
# Everyone knows 2.2 > 0, duh. |
| 116 |
SLOT="2.2" |
| 117 |
PROVIDE="virtual/libc" |
| 118 |
fi |
| 119 |
|
| 120 |
# General: We need a new-enough binutils for as-needed |
| 121 |
# arch: we need to make sure our binutils/gcc supports TLS |
| 122 |
DEPEND=">=sys-devel/gcc-3.4.4 |
| 123 |
arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) |
| 124 |
ppc? ( >=sys-devel/gcc-4.1.0 ) |
| 125 |
ppc64? ( >=sys-devel/gcc-4.1.0 ) |
| 126 |
>=sys-devel/binutils-2.15.94 |
| 127 |
${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)} |
| 128 |
|| ( >=sys-devel/gcc-config-1.3.12 app-admin/eselect-compiler ) |
| 129 |
>=app-misc/pax-utils-0.1.10 |
| 130 |
virtual/os-headers |
| 131 |
nls? ( sys-devel/gettext ) |
| 132 |
>=sys-apps/portage-2.1.2 |
| 133 |
selinux? ( sys-libs/libselinux )" |
| 134 |
RDEPEND="nls? ( sys-devel/gettext ) |
| 135 |
selinux? ( sys-libs/libselinux )" |
| 136 |
|
| 137 |
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then |
| 138 |
DEPEND="${DEPEND} ${CATEGORY}/gcc" |
| 139 |
[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" |
| 140 |
else |
| 141 |
DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c" |
| 142 |
RDEPEND="${RDEPEND} sys-libs/timezone-data" |
| 143 |
fi |
| 144 |
|
| 145 |
SRC_URI=$( |
| 146 |
upstream_uris() { |
| 147 |
echo mirror://gnu/glibc/$1 ftp://sources.redhat.com/pub/glibc/{releases,snapshots}/$1 |
| 148 |
} |
| 149 |
gentoo_uris() { |
| 150 |
local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" |
| 151 |
devspace=${devspace//HTTP/http://dev.gentoo.org/} |
| 152 |
echo mirror://gentoo/$1 ${devspace//URI/$1} |
| 153 |
} |
| 154 |
|
| 155 |
upstream_uris glibc-${RELEASE_VER}.tar.bz2 |
| 156 |
upstream_uris glibc-libidn-${RELEASE_VER}.tar.bz2 |
| 157 |
|
| 158 |
[[ -n ${PORTS_VER} ]] && upstream_uris glibc-ports-${PORTS_VER}.tar.bz2 |
| 159 |
[[ -n ${LT_VER} ]] && upstream_uris glibc-linuxthreads-${LT_VER}.tar.bz2 |
| 160 |
[[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 |
| 161 |
[[ -n ${PATCH_VER} ]] && gentoo_uris glibc-${PATCH_GLIBC_VER}-patches-${PATCH_VER}.tar.bz2 |
| 162 |
[[ -n ${MANPAGE_VER} ]] && gentoo_uris glibc-manpages-${MANPAGE_VER}.tar.bz2 |
| 163 |
[[ -n ${INFOPAGE_VER} ]] && gentoo_uris glibc-infopages-${INFOPAGE_VER}.tar.bz2 |
| 164 |
) |
| 165 |
|
| 166 |
# eblit-include [--skip] <function> [version] |
| 167 |
eblit-include() { |
| 168 |
local skipable=false |
| 169 |
[[ $1 == "--skip" ]] && skipable=true && shift |
| 170 |
|
| 171 |
local e v func=$1 ver=$2 |
| 172 |
[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" |
| 173 |
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do |
| 174 |
e="${FILESDIR}/eblits/${func}${v}.eblit" |
| 175 |
if [[ -e ${e} ]] ; then |
| 176 |
source "${e}" |
| 177 |
return 0 |
| 178 |
fi |
| 179 |
done |
| 180 |
${skipable} && return 0 |
| 181 |
die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" |
| 182 |
} |
| 183 |
|
| 184 |
# eblit-run <function> [version] |
| 185 |
# aka: src_unpack() { eblit-run src_unpack ; } |
| 186 |
eblit-run() { |
| 187 |
eblit-include --skip common "${*:2}" |
| 188 |
eblit-include "$@" |
| 189 |
eblit-${PN}-$1 || die |
| 190 |
} |
| 191 |
|
| 192 |
src_unpack() { eblit-run src_unpack ; } |
| 193 |
src_compile() { eblit-run src_compile ; } |
| 194 |
src_test() { eblit-run src_test ; } |
| 195 |
src_install() { eblit-run src_install ; } |
| 196 |
|
| 197 |
pkg_setup() { |
| 198 |
die "Review 196720 before upgrading mmmkay" |
| 199 |
|
| 200 |
# prevent native builds from downgrading ... maybe update to allow people |
| 201 |
# to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) |
| 202 |
if [[ ${ROOT} != "/" ]] && ! tc-is-cross-compiler ; then |
| 203 |
if has_version '>'${CATEGORY}/${PF} ; then |
| 204 |
eerror "Sanity check to keep you from breaking your system:" |
| 205 |
eerror " Downgrading glibc is not supported and a sure way to destruction" |
| 206 |
die "aborting to save your system" |
| 207 |
fi |
| 208 |
fi |
| 209 |
|
| 210 |
# users have had a chance to phase themselves, time to give em the boot |
| 211 |
if [[ -e ${ROOT}/etc/locale.gen ]] && [[ -e ${ROOT}/etc/locales.build ]] ; then |
| 212 |
eerror "You still haven't deleted ${ROOT}/etc/locales.build." |
| 213 |
eerror "Do so now after making sure ${ROOT}/etc/locale.gen is kosher." |
| 214 |
die "lazy upgrader detected" |
| 215 |
fi |
| 216 |
|
| 217 |
if [[ ${CTARGET} == i386-* ]] ; then |
| 218 |
eerror "i386 CHOSTs are no longer supported." |
| 219 |
eerror "Chances are you don't actually want/need i386." |
| 220 |
eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml" |
| 221 |
die "please fix your CHOST" |
| 222 |
fi |
| 223 |
|
| 224 |
if [[ -n ${LT_VER} ]] ; then |
| 225 |
if use nptlonly && ! use nptl ; then |
| 226 |
eerror "If you want nptlonly, add nptl to your USE too ;p" |
| 227 |
die "nptlonly without nptl" |
| 228 |
fi |
| 229 |
fi |
| 230 |
|
| 231 |
if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then |
| 232 |
ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." |
| 233 |
ewarn "This will result in a 50% performance penalty, which is probably not what you want." |
| 234 |
fi |
| 235 |
|
| 236 |
use hardened && ! gcc-specs-pie && \ |
| 237 |
ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" |
| 238 |
} |
| 239 |
|
| 240 |
fix_lib64_symlinks() { |
| 241 |
# the original Gentoo/AMD64 devs decided that since 64bit is the native |
| 242 |
# bitdepth for AMD64, lib should be used for 64bit libraries. however, |
| 243 |
# this ignores the FHS and breaks multilib horribly... especially |
| 244 |
# since it wont even work without a lib64 symlink anyways. *rolls eyes* |
| 245 |
# see bug 59710 for more information. |
| 246 |
# Travis Tilley <lv@g.o> (08 Aug 2004) |
| 247 |
if [ -L ${ROOT}/lib64 ] ; then |
| 248 |
ewarn "removing /lib64 symlink and moving lib to lib64..." |
| 249 |
ewarn "dont hit ctrl-c until this is done" |
| 250 |
rm ${ROOT}/lib64 |
| 251 |
# now that lib64 is gone, nothing will run without calling ld.so |
| 252 |
# directly. luckily the window of brokenness is almost non-existant |
| 253 |
use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
| 254 |
use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 |
| 255 |
# all better :) |
| 256 |
ldconfig |
| 257 |
ln -s lib64 ${ROOT}/lib |
| 258 |
einfo "done! :-)" |
| 259 |
einfo "fixed broken lib64/lib symlink in ${ROOT}" |
| 260 |
fi |
| 261 |
if [ -L ${ROOT}/usr/lib64 ] ; then |
| 262 |
rm ${ROOT}/usr/lib64 |
| 263 |
mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 |
| 264 |
ln -s lib64 ${ROOT}/usr/lib |
| 265 |
einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" |
| 266 |
fi |
| 267 |
if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then |
| 268 |
rm ${ROOT}/usr/X11R6/lib64 |
| 269 |
mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 |
| 270 |
ln -s lib64 ${ROOT}/usr/X11R6/lib |
| 271 |
einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" |
| 272 |
fi |
| 273 |
} |
| 274 |
|
| 275 |
pkg_preinst() { |
| 276 |
# PPC64+others may want to eventually be added to this logic if they |
| 277 |
# decide to be multilib compatible and FHS compliant. note that this |
| 278 |
# chunk of FHS compliance only applies to 64bit archs where 32bit |
| 279 |
# compatibility is a major concern (not IA64, for example). |
| 280 |
|
| 281 |
# amd64's 2005.0 is the first amd64 profile to not need this code. |
| 282 |
# 2005.0 is setup properly, and this is executed as part of the |
| 283 |
# 2004.3 -> 2005.0 upgrade script. |
| 284 |
# It can be removed after 2004.3 has been purged from portage. |
| 285 |
{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks |
| 286 |
|
| 287 |
# it appears that /lib/tls is sometimes not removed. See bug |
| 288 |
# 69258 for more info. |
| 289 |
if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && [[ ! -d ${D}/$(alt_libdir)/tls ]] ; then |
| 290 |
ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." |
| 291 |
rm -r "${ROOT}"/$(alt_libdir)/tls || die |
| 292 |
fi |
| 293 |
|
| 294 |
# Shouldnt need to keep this updated |
| 295 |
[[ -e ${ROOT}/etc/locale.gen ]] && rm -f "${D}"/etc/locale.gen |
| 296 |
|
| 297 |
# simple test to make sure our new glibc isnt completely broken. |
| 298 |
# make sure we don't test with statically built binaries since |
| 299 |
# they will fail. also, skip if this glibc is a cross compiler. |
| 300 |
[[ ${ROOT} != "/" ]] && return 0 |
| 301 |
[[ -d ${D}/$(get_libdir) ]] || return 0 |
| 302 |
local x striptest |
| 303 |
for x in date env ls true uname ; do |
| 304 |
x=$(type -p ${x}) |
| 305 |
[[ -z ${x} ]] && continue |
| 306 |
striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) |
| 307 |
[[ -z ${striptest} ]] && continue |
| 308 |
[[ ${striptest} == *"statically linked"* ]] && continue |
| 309 |
"${D}"/$(get_libdir)/ld-*.so \ |
| 310 |
--library-path "${D}"/$(get_libdir) \ |
| 311 |
${x} > /dev/null \ |
| 312 |
|| die "simple run test (${x}) failed" |
| 313 |
done |
| 314 |
} |
| 315 |
|
| 316 |
pkg_postinst() { |
| 317 |
if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then |
| 318 |
# Generate fastloading iconv module configuration file. |
| 319 |
"${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" |
| 320 |
fi |
| 321 |
|
| 322 |
if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then |
| 323 |
# Reload init ... |
| 324 |
/sbin/telinit U |
| 325 |
|
| 326 |
# if the host locales.gen contains no entries, we'll install everything |
| 327 |
local locale_list="${ROOT}etc/locale.gen" |
| 328 |
if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then |
| 329 |
ewarn "Generating all locales; edit /etc/locale.gen to save time/space" |
| 330 |
locale_list="${ROOT}usr/share/i18n/SUPPORTED" |
| 331 |
fi |
| 332 |
local x jobs |
| 333 |
for x in ${MAKEOPTS} ; do [[ ${x} == -j* ]] && jobs=${x#-j} ; done |
| 334 |
locale-gen -j ${jobs:-1} --config "${locale_list}" |
| 335 |
fi |
| 336 |
} |
| 337 |
|
| 338 |
|
| 339 |
|
| 340 |
-- |
| 341 |
gentoo-commits@g.o mailing list |
Archives