Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel grimoire by David Brown (e842c612457a21589316a4be2cda39c14bf5f649)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel grimoire by David Brown (e842c612457a21589316a4be2cda39c14bf5f649)

Chronological Thread  
    < Chronological >       < Thread >
  • From: David Brown <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel grimoire by David Brown (e842c612457a21589316a4be2cda39c14bf5f649)
  • Date: Mon, 29 Oct 2007 23:13:38 -0500
GIT changes to devel grimoire by David Brown <dmlb2000 AT gmail.com>:

libs/glibc/BUILD | 12 ++++++++----
libs/glibc/DETAILS | 17 +++++++++--------
libs/glibc/HISTORY | 18 ++++++++++++++++++
libs/glibc/PRE_BUILD | 4 ----
libs/glibc/PRE_INSTALL | 11 +++++++++++
libs/glibc/glibcshared.patch | 12 ------------
6 files changed, 46 insertions(+), 28 deletions(-)

New commits:
commit e842c612457a21589316a4be2cda39c14bf5f649
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc updated to 2.7

commit 0833a50c14ea9aa982b1c69a62c915c67a47732c
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc: remove /usr/include/{asm,asm-generic,linux} symlinks on install

commit 90d95cd8b597e3e0dd85d24116aebfd9daa24e61
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc updated kernel headers to new version of kernel

commit cda51b72423c7453134301d4f4766742b8eb7273
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "glibc updated glibc kernel headers to the new version"

This reverts commit c50decb0ff8f42d62d60dda24d099757a6dd2f02.

commit 091738b3b49471f8a4421de1266269a064dca0fc
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc updated glibc kernel headers to the new version

commit cc0f2a15028d095bb8afe46fe65a76c86d6422e4
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

glibc merged pre_build from test

commit 6bf1b40c8981343bb684364867fba8255307890c
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

merged conflicting PRE_BUILD

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 6a02339..42aa7a9 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -45,10 +45,14 @@ fi &&

OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}" &&

-#
-# Fixes Bug #8595
-#
-CFLAGS="-Os $CFLAGS" &&
+if [ "$GLIBC_NPTL" = "y" ] ; then
+ CFLAGS="${CFLAGS//-Os/} -O2"
+else
+ #
+ # Fixes Bug #8595
+ #
+ CFLAGS="-Os $CFLAGS"
+fi

export CFLAGS="${CFLAGS/-ffast-math/}" &&
export CC=gcc &&
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 17dced0..4275039 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,34 +1,34 @@
SPELL=glibc
if [ "$GLIBC_NPTL" = "y" ]; then
- VERSION=2.6.1
- HEADERS_VERSION=2.6.22.6
+ VERSION=2.7
+ HEADERS_VERSION=2.6.23.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32)
SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2
-
SOURCE3_HASH=sha512:e328abe55c7d3c239ec3dbede78ce405a662d3159382a2cb3db8dbf5b7783d230a237d44c23280171893c9213b55c4f9bf8963f193fc50158803078e3875ecef
+
SOURCE3_HASH=sha512:8860505c6d1b32b0f3f1180f648da65c3fc0a91b696e13ae9198a87dbfc2ea6e29eca471628237540857a993d43977cb3e5d794abb77bf07e6fa7bc0d4a76d12
;;
x86_64)
SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
-
SOURCE3_HASH=sha512:1d032b35eee2593896cdffd779ed3f695f5abb552c83f96fcabec46d5977b649db0741690be5dd40d712779b0f3816c6e04e7840991dad4e0a6881adee097852

+
SOURCE3_HASH=sha512:122eba0147cbd1e6eb6dedc3701d7118851e192a8d6189bbb95ed1822b637239b99abe80322368c1039e747d1129f0571014557b2d4775bc94f024a58991353f
;;
ppc)
SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
-
SOURCE3_HASH=sha512:06c5ff0fdbe39367df6538000358058fb6a804bc3711ad621fd825fa2887b2cb13b6992c32fe64da3381402b681b9ac526ac2b7eb2320966fcb9a6f6b1830737

+
SOURCE3_HASH=sha512:1e64989ce33eba084f6a612c2d798bae070b8dd42ef5cf4cf127a9c28645082b3d170026aa03de48ed0bbfd99942c38e6e28e3c58756b254ae960c9b6b13a9b5
;;
alpha)
SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
-
SOURCE3_HASH=sha512:a462e6ee9c446a71181e189d36b430fbdbf7070f2499d06e234b50f91ec3f0172a3428ecd37e7dad85bb153bfc985cea39e33785b7cffa9ac371a579412e6361
+
SOURCE3_HASH=sha512:002a7d1003eedc257c5be00970f61667cc6e328f6ee9d20572f755f74e0498193042e0a0a3d4ba0751f8481a682be090e358edb3167b211c8fc5c1c7ff69d81b
;;
sparc)
if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
then
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
-
SOURCE3_HASH=sha512:45665ceb4c8622615c3e9bbcbe57e8f9bd96d1cfd7d50aa7269ca8be9f6400c35feddc4b93251e56a7e0d5fbb48cf1b1e0f81bd9ca2853dc154cd38c1bd5ebe8
+
SOURCE3_HASH=sha512:d7e04e212ad1dc0605bf5d77cde8d150d0961c8a72c012bf9679115af993d857a9760a3ad54f207c4126dd4228882b60d553095cb59a00c390339b36dba9c4a3
else
SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
-
SOURCE3_HASH=sha512:264bf8f30dcfd72b8fcdb8e9486c8ffe59ec20bbb5f7379b9e300510d761128f636f2d6945ba97f7672fae878a0976e0dabf500a0c53702d67bf7790562a9484

+
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

Archive powered by MHonArc 2.6.24.

Top of Page