summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-06-25 15:46:27 +0000
committerMike Frysinger <vapier@gentoo.org>2004-06-25 15:46:27 +0000
commit7d626d0b9ef0c290297ffb197210fb895fd5951d (patch)
tree494dbb2e4c069cd2d31f4f1ffc4ad3737559b5b1 /scripts
parentQA - fix use invocation (Manifest recommit) (diff)
downloadgentoo-2-7d626d0b9ef0c290297ffb197210fb895fd5951d.tar.gz
gentoo-2-7d626d0b9ef0c290297ffb197210fb895fd5951d.tar.bz2
gentoo-2-7d626d0b9ef0c290297ffb197210fb895fd5951d.zip
buh bye virtual/glibc
Diffstat (limited to 'scripts')
-rw-r--r--scripts/bootstrap-2.6.sh4
-rwxr-xr-xscripts/bootstrap.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/bootstrap-2.6.sh b/scripts/bootstrap-2.6.sh
index fc8a7c781def..024eafc37a9e 100644
--- a/scripts/bootstrap-2.6.sh
+++ b/scripts/bootstrap-2.6.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-2.6.sh,v 1.7 2004/06/18 03:06:21 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-2.6.sh,v 1.8 2004/06/25 15:46:27 vapier Exp $
# IMPORTANT NOTE:
# This script no longer accepts an optional argument.
@@ -160,7 +160,7 @@ fi
myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-libs/glibc | sed 's:^\*::'`
# for non-glibc based systems such as uClibc
-[ -z "${myGLIBC}" ] && myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep virtual/glibc | awk '{print $2}'` && myGETTEXT=""
+[ -z "${myGLIBC}" ] && myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep virtual/libc | awk '{print $2}'` && myGETTEXT=""
myTEXINFO=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-apps/texinfo |sed 's:^\*::'`
myZLIB=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-libs/zlib |sed 's:^\*::'`
myNCURSES=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-libs/ncurses |sed 's:^\*::'`
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d3d36a447ba8..7a9316eb270a 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.55 2004/06/15 22:08:57 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.56 2004/06/25 15:46:27 vapier Exp $
# IMPORTANT NOTE:
# This script no longer accepts an optional argument.
@@ -129,7 +129,7 @@ myBINUTILS=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/binutil
myGCC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gcc | sed 's:^\*::'`
myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-libs/glibc | sed 's:^\*::'`
# for non-glibc based systems such as uClibc
-[ -z "${myGLIBC}" ] && myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep virtual/glibc | awk '{print $2}'` && myGETTEXT=""
+[ -z "${myGLIBC}" ] && myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep virtual/libc | awk '{print $2}'` && myGETTEXT=""
myTEXINFO=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-apps/texinfo |sed 's:^\*::'`
myZLIB=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-libs/zlib |sed 's:^\*::'`
myNCURSES=`cat ${MYPROFILEDIR}/packages|grep -v '^#'|grep sys-libs/ncurses |sed 's:^\*::'`