A new glibc that now compiles even if you don't use a -O optimization flag

5 files changed, 11 insertions, 502 deletions

diff --git a/sys-libs/glibc/files/digest-glibc-2.2.3-r5 b/sys-libs/glibc/files/digest-glibc-2.2.3-r5
new file mode 100644
index 000000000000..7261ba16aa7d
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.2.3-r5
@@ -0,0 +1,2 @@
+MD5 dce1d6d0b210c5a8c74918982341799b glibc-2.2.3.tar.gz
+MD5 46e9e722fbac89f0a94a8de872d3d39f glibc-linuxthreads-2.2.3.tar.gz
diff --git a/sys-libs/glibc/glibc-2.2.3-r1.ebuild b/sys-libs/glibc/glibc-2.2.3-r1.ebuild
deleted file mode 100644
index 2574c1db3cd9..000000000000
--- a/sys-libs/glibc/glibc-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r1.ebuild,v 1.3 2001/06/07 23:20:03 achim Exp $
-
-A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-DEPEND="nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-
-if [ -z "`use bootstrap`" ] ; then
-RDEPEND="gd? ( sys-libs/zlib media-libs/libpng )"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-
-    unpack glibc-${PV}.tar.gz
-    cd ${S}
-    unpack glibc-linuxthreads-${PV}.tar.gz
-    for i in mtrace-intl-perl 
-    do
-      echo "Applying $i patch..."
-      patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff
-    done
-    patch -p0 < ${FILESDIR}/glibc-2.2.3-libnss.diff
-    cd io
-    patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
-
-
-}
-
-src_compile() {
-
-	local myconf
-	if [ "`use build`" ]
-	then
-	  # If we build for the build system we use the kernel headers from the target
-	  myconf="--with-header=${ROOT}usr/include"
-	fi
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ]
-	then
-	  myconf="${myconf} --with-gd=yes"
-	else
-	  myconf="${myconf} --with-gd=no"
-	fi
-    if [ -z "`use nls`" ]
-    then
-      myconf="${myconf} --disable-nls"
-    fi
-    rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	try ../configure --host=${CHOST} --without-cvs \
-		--enable-add-ons=linuxthreads \
-		--disable-profile --prefix=/usr \
-                --mandir=/usr/share/man --infodir=/usr/share/info \
-                --libexecdir=/usr/lib/misc \
-		--enable-kernel=2.4.0 ${myconf}
-	try make 
-	make check
-}
-
-
-src_install() {
-
-    rm -rf ${D}
-    mkdir ${D}
-    dodir /etc/rc.d/init.d
-    export LC_ALL=C
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere
-    if [ -z "`use build`" ]
-    then
-      try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere
-
-	# I commented out linuxthreads man pages because I don't want
-	# glibc to build depend on perl
-	#    dodir /usr/share/man/man3
-	#    try make MANDIR=${D}/usr/share/man/man3 install -C linuxthreads/man
-	#    cd ${D}/usr/share/man/man3
-	#    for i in *.3thr
-	#    do
-	#      mv ${i} ${i%.3thr}.3
-	#    done
-
-      install -m 644 nscd/nscd.conf ${D}/etc
-      install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd
-      dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \
-	  PROJECTS README*
-    else
-      rm -rf ${D}/usr/share/{man,info,zoneinfo}
-    fi
-
-    if [ "`use pic`" ]
-    then
-        find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-        find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-        for i in ${D}/lib/*.map
-        do
-          mv ${i} ${i%.map}_pic.map
-        done
-    fi
-    rm ${D}/lib/ld-linux.so.2
-    rm ${D}/lib/libc.so.6
-    rm ${D}/lib/libpthread.so.0
-    chmod 755 ${D}/usr/lib/misc/pt_chown
- 
-}
-
-pkg_preinst()
-{
-    # Check if we run under X
-    if [ -e /usr/X11R6/bin/X ]
-    then
-	if [ "`/sbin/pidof /usr/X11R6/bin/X`" ]
-	then
-	    echo "glibc can not be installed while X is running!!"
-	    exit 1
-        fi
-    fi
-    
-    echo "Saving ld-linux,libc6 and libpthread"
-    for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-    do
-	if [ -f ${ROOT}lib/${file} ]
-	then
-	    /bin/cp ${ROOT}lib/${file} ${ROOT}tmp
-	    /sbin/sln ${ROOT}tmp/${file} ${ROOT}lib/${file}
-	fi
-    done
-    
-    if [ -e ${ROOT}etc/localtime ]
-    then
-	#keeping old timezone
-	if [ -e ${D}/etc/localtime ] ; then
-		  /bin/rm ${D}/etc/localtime
-		fi
-	else
-		echo "Please remember to set your timezone using the zic command."
-	fi
-}
-
-pkg_postinst()
-{
-  echo "Setting ld-linux,libc6 and libpthread"
-
-  /sbin/sln ${ROOT}lib/ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-  /sbin/sln ${ROOT}lib/libc-${PV}.so ${ROOT}lib/libc.so.6
-  /sbin/sln ${ROOT}lib/libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-  /bin/rm -f ${ROOT}tmp/ld-linux.so.2
-  /bin/rm -f ${ROOT}tmp/libc.so.6
-  /bin/rm -f ${ROOT}tmp/libpthread.so.0
-  /sbin/ldconfig -r ${ROOT}
-
-}
diff --git a/sys-libs/glibc/glibc-2.2.3-r2.ebuild b/sys-libs/glibc/glibc-2.2.3-r2.ebuild
deleted file mode 100644
index ae0c48c65389..000000000000
--- a/sys-libs/glibc/glibc-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r2.ebuild,v 1.2 2001/06/27 03:49:24 achim Exp $
-
-A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-DEPEND="nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-
-if [ -z "`use bootstrap`" ] ; then
-RDEPEND="gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-RDEPEND="sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-
-    unpack glibc-${PV}.tar.gz
-    cd ${S}
-    unpack glibc-linuxthreads-${PV}.tar.gz
-    for i in mtrace-intl-perl
-    do
-      echo "Applying $i patch..."
-      try patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff
-    done
-    try patch -p0 < ${FILESDIR}/glibc-2.2.3-libnss.diff
-    try patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff
-    cd io
-    try patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
-
-}
-
-src_compile() {
-
-	local myconf
-	if [ "`use build`" ]
-	then
-	  # If we build for the build system we use the kernel headers from the target
-	  myconf="--with-header=${ROOT}usr/include"
-	fi
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ]
-	then
-	  myconf="${myconf} --with-gd=yes"
-	else
-	  myconf="${myconf} --with-gd=no"
-	fi
-    if [ -z "`use nls`" ]
-    then
-      myconf="${myconf} --disable-nls"
-    fi
-    rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	try ../configure --host=${CHOST} --without-cvs \
-		--enable-add-ons=linuxthreads \
-		--disable-profile --prefix=/usr \
-                --mandir=/usr/share/man --infodir=/usr/share/info \
-                --libexecdir=/usr/lib/misc \
-		--enable-kernel=2.4.0 ${myconf}
-	try make 
-	make check
-}
-
-
-src_install() {
-
-    rm -rf ${D}
-    mkdir ${D}
-    dodir /etc/rc.d/init.d
-    export LC_ALL=C
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere
-    if [ -z "`use build`" ]
-    then
-      try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere
-
-	# I commented out linuxthreads man pages because I don't want
-	# glibc to build depend on perl
-	#    dodir /usr/share/man/man3
-	#    try make MANDIR=${D}/usr/share/man/man3 install -C linuxthreads/man
-	#    cd ${D}/usr/share/man/man3
-	#    for i in *.3thr
-	#    do
-	#      mv ${i} ${i%.3thr}.3
-	#    done
-
-      install -m 644 nscd/nscd.conf ${D}/etc
-      install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd
-      dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \
-	  PROJECTS README*
-    else
-      rm -rf ${D}/usr/share/{man,info,zoneinfo}
-    fi
-
-    if [ "`use pic`" ]
-    then
-        find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-        find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-        for i in ${D}/lib/*.map
-        do
-          mv ${i} ${i%.map}_pic.map
-        done
-    fi
-    rm ${D}/lib/ld-linux.so.2
-    rm ${D}/lib/libc.so.6
-    rm ${D}/lib/libpthread.so.0
-    chmod 755 ${D}/usr/lib/misc/pt_chown
- 
-}
-
-pkg_preinst()
-{
-    # Check if we run under X
-    if [ -e /usr/X11R6/bin/X ]
-    then
-	if [ "`/sbin/pidof /usr/X11R6/bin/X`" ]
-	then
-	    echo "glibc can not be installed while X is running!!"
-	    exit 1
-        fi
-    fi
-    
-    echo "Saving ld-linux,libc6 and libpthread"
-    for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-    do
-	if [ -f ${ROOT}lib/${file} ]
-	then
-	    /bin/cp ${ROOT}lib/${file} ${ROOT}tmp
-	    /sbin/sln ${ROOT}tmp/${file} ${ROOT}lib/${file}
-	fi
-    done
-    
-    if [ -e ${ROOT}etc/localtime ]
-    then
-	#keeping old timezone
-	if [ -e ${D}/etc/localtime ] ; then
-		  /bin/rm ${D}/etc/localtime
-		fi
-	else
-		echo "Please remember to set your timezone using the zic command."
-	fi
-}
-
-pkg_postinst()
-{
-  echo "Setting ld-linux,libc6 and libpthread"
-
-  /sbin/sln ${ROOT}lib/ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-  /sbin/sln ${ROOT}lib/libc-${PV}.so ${ROOT}lib/libc.so.6
-  /sbin/sln ${ROOT}lib/libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-  /bin/rm -f ${ROOT}tmp/ld-linux.so.2
-  /bin/rm -f ${ROOT}tmp/libc.so.6
-  /bin/rm -f ${ROOT}tmp/libpthread.so.0
-  /sbin/ldconfig -r ${ROOT}
-
-}
diff --git a/sys-libs/glibc/glibc-2.2.3-r3.ebuild b/sys-libs/glibc/glibc-2.2.3-r3.ebuild
deleted file mode 100644
index 2f4bd09a2ee4..000000000000
--- a/sys-libs/glibc/glibc-2.2.3-r3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r3.ebuild,v 1.1 2001/07/07 03:20:30 drobbins Exp $
-
-A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz
-	 ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz
-	 ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
-
-DEPEND="nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )"
-
-if [ -z "`use bootstrap`" ] ; then
-RDEPEND="gd? ( sys-libs/zlib media-libs/libpng ) sys-apps/baselayout"
-else
-RDEPEND="sys-apps/baselayout"
-fi
-
-PROVIDE="virtual/glibc"
-
-src_unpack() {
-
-    unpack glibc-${PV}.tar.gz
-    cd ${S}
-    unpack glibc-linuxthreads-${PV}.tar.gz
-    for i in mtrace-intl-perl
-    do
-      echo "Applying $i patch..."
-      try patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff
-    done
-    try patch -p0 < ${FILESDIR}/glibc-2.2.3-libnss.diff
-    try patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff
-    cd io
-    try patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
-
-}
-
-src_compile() {
-	local myconf
-	if [ "`use build`" ]
-	then
-		# If we build for the build system we use the kernel headers from the target
-		myconf="--with-header=${ROOT}usr/include"
-	fi
-	if [ "`use gd`" ] && [ -z "`use bootstrap`" ]
-	then
-		myconf="${myconf} --with-gd=yes"
-	else
-		myconf="${myconf} --with-gd=no"
-	fi
-    if [ -z "`use nls`" ]
-    then
-		myconf="${myconf} --disable-nls"
-    fi
-    rm -rf buildhere
-	mkdir buildhere
-	cd buildhere
-	try ../configure --host=${CHOST} --without-cvs \
-		--enable-add-ons=linuxthreads \
-		--disable-profile --prefix=/usr \
-		--mandir=/usr/share/man --infodir=/usr/share/info \
-		--libexecdir=/usr/lib/misc ${myconf}
-		
-	#This next option breaks the Sun JDK and the IBM JDK
-	#We should really keep compatibility with older kernels, anyway
-	#--enable-kernel=2.4.0
-	try make 
-	make check
-}
-
-
-src_install() {
-
-    rm -rf ${D}
-    mkdir ${D}
-    dodir /etc/rc.d/init.d
-    export LC_ALL=C
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere
-    try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere
-    if [ -z "`use build`" ]
-    then
-		try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere
-
-	# I commented out linuxthreads man pages because I don't want
-	# glibc to build depend on perl
-	#    dodir /usr/share/man/man3
-	#    try make MANDIR=${D}/usr/share/man/man3 install -C linuxthreads/man
-	#    cd ${D}/usr/share/man/man3
-	#    for i in *.3thr
-	#    do
-	#      mv ${i} ${i%.3thr}.3
-	#    done
-
-		install -m 644 nscd/nscd.conf ${D}/etc
-		install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \
-		PROJECTS README*
-    else
-		rm -rf ${D}/usr/share/{man,info,zoneinfo}
-    fi
-
-    if [ "`use pic`" ]
-    then
-        find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \;
-        find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \;
-        for i in ${D}/lib/*.map
-        do
-          mv ${i} ${i%.map}_pic.map
-        done
-    fi
-    rm ${D}/lib/ld-linux.so.2
-    rm ${D}/lib/libc.so.6
-    rm ${D}/lib/libpthread.so.0
-    chmod 755 ${D}/usr/lib/misc/pt_chown
-}
-
-pkg_preinst()
-{
-    # Check if we run under X
-    if [ -e /usr/X11R6/bin/X ]
-    then
-	if [ "`/sbin/pidof /usr/X11R6/bin/X`" ]
-	then
-	    echo "glibc can not be installed while X is running!!"
-	    exit 1
-        fi
-    fi
-    
-    echo "Saving ld-linux,libc6 and libpthread"
-    for file in ld-linux.so.2 libc.so.6 libpthread.so.0
-    do
-	if [ -f ${ROOT}lib/${file} ]
-	then
-	    /bin/cp ${ROOT}lib/${file} ${ROOT}tmp
-	    /sbin/sln ${ROOT}tmp/${file} ${ROOT}lib/${file}
-	fi
-    done
-    
-    if [ -e ${ROOT}etc/localtime ]
-    then
-	#keeping old timezone
-	if [ -e ${D}/etc/localtime ] ; then
-		  /bin/rm ${D}/etc/localtime
-		fi
-	else
-		echo "Please remember to set your timezone using the zic command."
-	fi
-}
-
-pkg_postinst()
-{
-  echo "Setting ld-linux,libc6 and libpthread"
-
-  /sbin/sln ${ROOT}lib/ld-${PV}.so ${ROOT}lib/ld-linux.so.2
-  /sbin/sln ${ROOT}lib/libc-${PV}.so ${ROOT}lib/libc.so.6
-  /sbin/sln ${ROOT}lib/libpthread-0.9.so ${ROOT}lib/libpthread.so.0
-  /bin/rm -f ${ROOT}tmp/ld-linux.so.2
-  /bin/rm -f ${ROOT}tmp/libc.so.6
-  /bin/rm -f ${ROOT}tmp/libpthread.so.0
-  /sbin/ldconfig -r ${ROOT}
-
-}
diff --git a/sys-libs/glibc/glibc-2.2.3-r4.ebuild b/sys-libs/glibc/glibc-2.2.3-r5.ebuild
index f32855b92474..3fb2aa2b7ba5 100644
--- a/sys-libs/glibc/glibc-2.2.3-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.2.3-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r4.ebuild,v 1.3 2001/08/05 22:58:06 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.3-r5.ebuild,v 1.1 2001/08/13 00:35:29 drobbins Exp $
 
 A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz"
 S=${WORKDIR}/${P}
@@ -39,7 +39,14 @@ src_unpack() {
     try patch -p0 < ${FILESDIR}/glibc-2.2.3-string2.diff
     cd io
     try patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch
-	
+	#now we need to fix a problem where glibc-2.2.3 doesn't compile with absolutely no -O optimizations.
+	#we'll need to keep our eyes on this one to see how things are in later versions of linuxthreads:
+	#for more info, see:
+	# http://gcc.gnu.org/ml/gcc-prs/2001-06/msg00044.html
+	# http://www.mail-archive.com/bug-glibc@gnu.org/msg01820.html
+	cd ${S}/linuxthreads
+	cp spinlock.c spinlock.c.orig
+	sed -e 's/ : "0" (lock->__status)//g' spinlock.c.orig > spinlock.c
 }
 
 src_compile() {