+
SOURCE3_HASH=sha512:5e398a9ccf5b19ce2ea910002e9ac4d054c90b5b7cb54edab97634da0f34002056e1d1b0dd02cc623557b32422fae286905bb60be327d5e4912e75b00e10660d
fi
;;
*)
@@ -50,6 +50,7 @@ esac
fi
SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+ PATCHLEVEL=1
else
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index f941c42..ed763c1 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,21 @@
+2007-10-30 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: removed -Os for -O2 doesn't do inline quite the same
+ * DETAILS: updated to 2.7
+
+2007-10-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_INSTALL: remove each of /usr/include/{asm,asm-generic,linux} if
+ it is a symlink, seems like some installations still have those,
+ which breaks stuff
+
+2007-10-18 David Brown <dmlb2000 AT gmail.com>
+ * DETAILS: updated header version to 2.6.23.1
+
+2007-09-23 David Brown <dmlb2000 AT gmail.com>
+ * PRE_BUILD: nisplus_fix.diff and iconv_open.patch removed not needed
+ * nisplus_fix.diff: removed
+ * iconv_open.patch: removed
+ * glibcshared.patch: removed for same reason
+
2007-09-16 David Brown <dmlb2000 AT gmail.com>
* DETAILS: removed GLIBC_ARCH altogether
* BUILD: removed GLIBC_ARCH gone... and some syntax errors as a result
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 8949c23..19cef96 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -8,7 +8,6 @@ local
GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION &&
if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
-
if [ "$GLIBC_USEIDN" = "y" ]; then
#
# Unpack glibc-libidn
@@ -53,9 +52,6 @@ fi &&
# Now fixup the normal glibc
#
cd $SOURCE_DIRECTORY &&
-if [[ $GLIBC_NPTL == n ]]; then
- patch -p1 < $SCRIPT_DIRECTORY/glibcshared.patch
-fi &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 4cda515..cadcee1 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -26,4 +26,15 @@ fi &&
if spell_ok glibc; then
dispel --notriggers --nosustain glibc
+fi &&
+
+# clean up symlinks that break stuff, we used to install those
+if [[ -h $INSTALL_ROOT/usr/include/asm ]]; then
+ rm -f $INSTALL_ROOT/usr/include/asm
+fi &&
+if [[ -h $INSTALL_ROOT/usr/include/asm-generic ]]; then
+ rm -f $INSTALL_ROOT/usr/include/asm-generic
+fi &&
+if [[ -h $INSTALL_ROOT/usr/include/linux ]]; then
+ rm -f $INSTALL_ROOT/usr/include/linux
fi
diff --git a/libs/glibc/glibcshared.patch b/libs/glibc/glibcshared.patch
deleted file mode 100644
index 5c2f22a..0000000
--- a/libs/glibc/glibcshared.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur glibc-2.3.5.orig/sysdeps/unix/sysv/linux/i386/sysdep.h
glibc-2.3.5/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.3.5.orig/sysdeps/unix/sysv/linux/i386/sysdep.h 2005-04-11
11:06:13.530536216 -0700
-+++ glibc-2.3.5/sysdeps/unix/sysv/linux/i386/sysdep.h 2005-04-11
11:08:00.636253672 -0700
-@@ -454,7 +454,7 @@
-
- #define LOADARGS_0
- #ifdef __PIC__
--# if defined I386_USE_SYSENTER
-+# if defined I386_USE_SYSENTER && defined SHARED
- # define LOADARGS_1 \
- "bpushl .L__X'%k3, %k3\n\t"
- # define LOADARGS_5 \
[SM-Commit] GIT changes to devel grimoire by David Brown (e842c612457a21589316a4be2cda39c14bf5f649),
David Brown, 10/30/2007