summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gottinger <achim@gentoo.org>2001-06-16 18:46:11 +0000
committerAchim Gottinger <achim@gentoo.org>2001-06-16 18:46:11 +0000
commitb104a66463ec9d11ba17fbfe59d3beefde17ab2e (patch)
tree0454c716912223ca36bfa47f4c8df1a9b18cf98e /sys-libs
parentanother fixum (diff)
downloadgentoo-2-b104a66463ec9d11ba17fbfe59d3beefde17ab2e.tar.gz
gentoo-2-b104a66463ec9d11ba17fbfe59d3beefde17ab2e.tar.bz2
gentoo-2-b104a66463ec9d11ba17fbfe59d3beefde17ab2e.zip
Added mikaels patch for the string2 warnings
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/files/digest-glibc-2.2.3-r22
-rw-r--r--sys-libs/glibc/files/glibc-2.2.3-string2.diff41
-rw-r--r--sys-libs/glibc/glibc-2.2.3-r2.ebuild165
3 files changed, 208 insertions, 0 deletions
diff --git a/sys-libs/glibc/files/digest-glibc-2.2.3-r2 b/sys-libs/glibc/files/digest-glibc-2.2.3-r2
new file mode 100644
index 000000000000..7261ba16aa7d
--- /dev/null
+++ b/sys-libs/glibc/files/digest-glibc-2.2.3-r2
@@ -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/files/glibc-2.2.3-string2.diff b/sys-libs/glibc/files/glibc-2.2.3-string2.diff
new file mode 100644
index 000000000000..b6312c78d497
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.2.3-string2.diff
@@ -0,0 +1,41 @@
+--- string/bits/string2.h.old Tue Jun 12 12:52:46 2001
++++ string/bits/string2.h Tue Jun 12 12:53:51 2001
+@@ -415,7 +415,7 @@
+ break;
+ case 3:
+ __u->__usi = __src0_2;
+- __u = __extension__ ((void *) __u + 2);
++ __u = __extension__ (void *)((char *) __u + 2);
+ __u->__uc = '\0';
+ break;
+ case 4:
+@@ -423,24 +423,24 @@
+ break;
+ case 5:
+ __u->__ui = __src0_4;
+- __u = __extension__ ((void *) __u + 4);
++ __u = __extension__ (void *)((char *) __u + 4);
+ __u->__uc = '\0';
+ break;
+ case 6:
+ __u->__ui = __src0_4;
+- __u = __extension__ ((void *) __u + 4);
++ __u = __extension__ (void *)((char *) __u + 4);
+ __u->__usi = __src4_2;
+ break;
+ case 7:
+ __u->__ui = __src0_4;
+- __u = __extension__ ((void *) __u + 4);
++ __u = __extension__ (void *)((char *) __u + 4);
+ __u->__usi = __src4_2;
+- __u = __extension__ ((void *) __u + 2);
++ __u = __extension__ (void *)((char *) __u + 2);
+ __u->__uc = '\0';
+ break;
+ case 8:
+ __u->__ui = __src0_4;
+- __u = __extension__ ((void *) __u + 4);
++ __u = __extension__ (void *)((char *) __u + 4);
+ __u->__ui = __src4_4;
+ break;
+ }
diff --git a/sys-libs/glibc/glibc-2.2.3-r2.ebuild b/sys-libs/glibc/glibc-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..3b5036e1535b
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.2.3-r2.ebuild
@@ -0,0 +1,165 @@
+# 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.1 2001/06/16 18:46:11 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..."
+ 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}
+
+}