@@ -37,6 +40,28 @@
* PRE_INSTALL: removed explicit check of HOST for check against
SMGL_COMPAT_ARCHS
+2006-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, nisplus_fix.diff: fix for upstream bug
+ http://sourceware.org/bugzilla/show_bug.cgi?id=2429,
+ set PATCHLEVEL=1 for glibc 2.4
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated NPTL glibc to 2.4 (linuxthreads has to stay at
+ 2.3.6 as linxuthread/kernel 2.4 support has been dropped).
+ Removed DISTCC_HOSTS, make_single in BUILD takes care of that.
+ Seperate 2.3.6 and 2.4 SOURCE*, use upstream signatures where
+ applicable.
+ * PRE_BUILD, kd.h.patch: removed, not necessary with 2.4 headers,
+ already applied in 2.4
+ * CONFIGURE, DETAILS, INSTALL, locales: removed locale generation,
done
+ by the locale spell now, updated PATCHLEVEL for 2.3.6 in DETAILS
+ * INSTALL: install kernel headers before running 'make install', as
+ glibc 2.4 decides to recompile some stuff during install which fails
+ otherwise
+
2006-02-22 Juuso Alasuutari <juuso.alasuutari AT tamperelainen.org>
* DETAILS: patchlevel downgraded to previous value, no need to
recompile
@@ -53,6 +78,10 @@
2006-02-06 Eric Sandall <eric AT sandall.us>
* DEPENDS: Depends on gnupg (for SOURCE verification)
+2005-12-23 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: bump PATCHLEVEL
+ * PRE_BUILD: apply kd.h.patch
+
2005-12-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: fix linux/agpgart.h header
* DETAILS: set PATCHLEVEL=1 for NPTL glibc
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index d6b59b1..35d8acc 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -1,28 +1,28 @@
-cd $SOURCE_DIRECTORY.bld &&
-
#
-# the following conditional is commented out because the
-# make install install_root="${INSTALL_ROOT}"
-# does what it does already.
+# install kernel headers first so that gcc doesn't fail to find them if
+# glibc decides to compile stuff during 'make install', which it does in 2.4
#
+install -d ${INSTALL_ROOT}/usr/include &&
+cd $GLIBC_HEADERS_DIR/include &&
+
+if [ ! "$GLIBC_NPTL" = "y" ]; then
+ echo "installing asm-generic headers" &&
+ install -d ${INSTALL_ROOT}/usr/include/asm-generic &&
+ cp -fa asm-generic/* ${INSTALL_ROOT}/usr/include/asm-generic
+fi &&
+
+echo "installing glibc linux headers" &&
+install -d ${INSTALL_ROOT}/usr/include/linux &&
+cp -fa linux/* ${INSTALL_ROOT}/usr/include/linux &&