diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2004-01-12 07:34:38 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2004-01-12 07:34:38 +0000 |
| commit | 1f90238c2491c5bc71257e3802c09d791383a045 (patch) | |
| tree | 4d52d5583ec60ec9e419d4fd21d005fdd3af61b3 /src | |
| parent | portage-2.0.50_pre12 (diff) | |
| download | portage-cvs-1f90238c2491c5bc71257e3802c09d791383a045.tar.gz portage-cvs-1f90238c2491c5bc71257e3802c09d791383a045.tar.bz2 portage-cvs-1f90238c2491c5bc71257e3802c09d791383a045.zip | |
Warning in configs. DB operation reorganization, counter fix, sandbox speedup for the glibc finding stuff.
0 . 0
\_U_/
Diffstat (limited to 'src')
| -rw-r--r-- | src/sandbox-1.1/ChangeLog | 5 | ||||
| -rwxr-xr-x | src/sandbox-1.1/create-localdecls | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/sandbox-1.1/ChangeLog b/src/sandbox-1.1/ChangeLog index 47038c0..9374ebc 100644 --- a/src/sandbox-1.1/ChangeLog +++ b/src/sandbox-1.1/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Path Sandbox # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.28 2003/12/31 09:45:51 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/ChangeLog,v 1.29 2004/01/12 07:34:38 carpaski Exp $ + + 11 Jan 2004; Nicholas Jones <carpaski@gentoo.org> create-decls: + Changed tail to head and added a notice about duration of glibc check. 21 Dec 2003; Nicholas Jones <carpaski@gentoo.org> create-decls: Changed the glibc subversion check to use /usr/bin/* instead of /bin/sh diff --git a/src/sandbox-1.1/create-localdecls b/src/sandbox-1.1/create-localdecls index 55b51f8..0fa5a82 100755 --- a/src/sandbox-1.1/create-localdecls +++ b/src/sandbox-1.1/create-localdecls @@ -8,7 +8,7 @@ # # Uhm... time to learn GNU autoconf :-) # -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/create-localdecls,v 1.10 2003/12/31 09:45:51 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/src/sandbox-1.1/Attic/create-localdecls,v 1.11 2004/01/12 07:34:38 carpaski Exp $ OUTFILE='localdecls.h' @@ -42,7 +42,7 @@ fi echo -n 'Checking libc version... ' gcc -Wall -o libctest libctest.c VERSION=`ldd libctest | grep libc\\.so | grep -v 'ld-uClibc' | awk '{print $1}'` -rm libctest + echo $VERSION echo "#define LIBC_VERSION \"$VERSION\"" >> $OUTFILE if test "$VERSION" = 'libc.so.5' ; then @@ -61,12 +61,13 @@ else fi if test "$VERSION" = 'libc.so.6' ; then - echo -n 'Checking glibc subversion... ' - tmp="$(ldd /usr/bin/* 2>/dev/null | grep libc.so | tail -n 1)" + echo -n 'Checking glibc subversion...' + tmp="$(ldd libctest 2>/dev/null | grep libc.so 2>/dev/null | head -n 1)" LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'` tmp="`strings $LibcPath | grep -i 'c library'`" OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'` OsLibcMinor=`expr "$tmp" : '.* [0-9][0-9]*\.\([0-9][0-9]*\)'` + echo " ${OsLibcMajor}.${OsLibcMinor}" case "$OsLibcMajor" in 2) # 2 is the glibc version @@ -92,6 +93,8 @@ if test "$VERSION" = 'libc.so.6' ; then esac fi +rm libctest + echo ' #ifdef PATH_MAX # define SB_PATH_MAX PATH_MAX * 2 |