diff options
| author |   Ned Ludd <solar@gentoo.org> | 2004-06-15 22:08:57 +0000 |
|---|---|---|
| committer | Ned Ludd <solar@gentoo.org> | 2004-06-15 22:08:57 +0000 |
| commit | c4d8b3b5ce8b281e4f68cf9aef682219c53339af (patch) | |
| tree | 9450b278d4c8486fce703020f88e7ccb1ba8bbd2 /scripts | |
| parent | Stable on alpha. (Manifest recommit) (diff) | |
| download | gentoo-2-c4d8b3b5ce8b281e4f68cf9aef682219c53339af.tar.gz gentoo-2-c4d8b3b5ce8b281e4f68cf9aef682219c53339af.tar.bz2 gentoo-2-c4d8b3b5ce8b281e4f68cf9aef682219c53339af.zip | |
uClibc bootstrap tweaks
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap-2.6.sh | 4 | ||||
| -rw-r--r-- | scripts/bootstrap-cascade.sh | 6 | ||||
| -rwxr-xr-x | scripts/bootstrap.sh | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/scripts/bootstrap-2.6.sh b/scripts/bootstrap-2.6.sh index 08f17594908e..ca193557fad1 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.4 2004/06/10 17:17:33 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-2.6.sh,v 1.5 2004/06/15 22:08:57 solar Exp $ # IMPORTANT NOTE: # This script no longer accepts an optional argument. @@ -157,6 +157,8 @@ if [ -z "${myOS_HEADERS}" ]; then 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="" 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-cascade.sh b/scripts/bootstrap-cascade.sh index 3a96d7eaf5f9..f8d84a307abf 100644 --- a/scripts/bootstrap-cascade.sh +++ b/scripts/bootstrap-cascade.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-cascade.sh,v 1.2 2004/04/06 06:43:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap-cascade.sh,v 1.3 2004/06/15 22:08:57 solar Exp $ # IMPORTANT NOTE: # This script no longer accepts an optional argument. @@ -133,8 +133,8 @@ n=${n%%-[0-9]*}; echo "my$(tr a-z- A-Z_ <<<$n)=$p; "; done) #myBASELAYOUT=`echo ${myPROFPACKAGES} | grep -v #myPORTAGE=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-apps/portage | sed 's:^\*::'` #myGETTEXT=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gettext | sed 's:^\*::'` -# Not all profiles have gettest in the system profile anymore ... -[ -z "${myGETTEXT}" ] && myGETTEXT="sys-devel/gettext" +# Not all profiles have gettext in the system profile anymore ... +#[ -z "${myGETTEXT}" ] && myGETTEXT="sys-devel/gettext" #myBINUTILS=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/binutils | sed 's:^\*::'` #myGCC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gcc | sed 's:^\*::'` #myGLIBC=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-libs/glibc | sed 's:^\*::'` diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 8e1aed36aa8a..d3d36a447ba8 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.54 2004/04/06 06:43:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/scripts/bootstrap.sh,v 1.55 2004/06/15 22:08:57 solar Exp $ # IMPORTANT NOTE: # This script no longer accepts an optional argument. @@ -128,6 +128,8 @@ myGETTEXT=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/gettext myBINUTILS=`cat ${MYPROFILEDIR}/packages | grep -v '^#' | grep sys-devel/binutils | sed 's:^\*::'` 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="" 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:^\*::'` |