Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5467291d26621cb96833e71f1b16a4acdedd0c20)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (5467291d26621cb96833e71f1b16a4acdedd0c20)
  • Date: Tue, 19 May 2009 02:55:52 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null |binary
libs/glibc/DETAILS | 22 +++++++++++++++-------
libs/glibc/HISTORY | 7 +++++++
libs/glibc/Neumeier.gpg | 0
libs/glibc/PRE_BUILD | 12 +++++++++++-
libs/glibc/bug-15014.patch | 13 -------------
6 files changed, 33 insertions(+), 21 deletions(-)

New commits:
commit 5467291d26621cb96833e71f1b16a4acdedd0c20
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

glibc 2.10.1

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index f7c66ad..e284b61 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -22,7 +22,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
if [[ "$GLIBC_CVS" == "y" ]]; then
local GLIBC_VERSION
- GLIBC_VERSION=2.9
+ GLIBC_VERSION=2.10.1
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
@@ -33,15 +33,23 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}

SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
SOURCE_IGNORE=volatile
else
- VERSION=2.9
+ VERSION=2.10.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://toolchain.freesa.org/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=Neumeier.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=2
+ if [ "$GLIBC_USEIDN" = "y" ]; then
+ SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
+ SOURCE5=$SOURCE4.sig
+ SOURCE4_URL[0]=$GNU_URL/$SPELL/$SOURCE4
+ SOURCE5_URL[0]=${SOURCE4_URL[0]}.sig
+ SOURCE4_GPG=gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY
+ SOURCE5_IGNORE=signature
+ fi
+ PATCHLEVEL=0
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.29
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 73fa428..bc78de6 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2009-05-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.1, updated SOURCE_URL[0], asc -> sig
+ Neumeier.gpg -> gnu.gpg
+ * DETAILS, PRE_BUILD: no internal libidn, SOURCE4 and SOURCE5 get back
+ * PRE_BUILD, bug-15014.patch: removed patch
+ * Neumeier.gpg: removed
+
2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Update default headers to 2.6.29
Use standard kernel source for headers to avoid packaging per
diff --git a/libs/glibc/Neumeier.gpg b/libs/glibc/Neumeier.gpg
deleted file mode 100644
index 34d83dd..0000000
Binary files a/libs/glibc/Neumeier.gpg and /dev/null differ
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 561adb4..9b5bfe0 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,5 +1,16 @@
default_pre_build &&

+local GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION &&
+
+if [ "$GLIBC_USEIDN" = "y" ] && [[ "$GLIBC_CVS" != "y" ]]; then
+ #
+ # Unpack glibc-libidn
+ #
+ cd $SOURCE_DIRECTORY &&
+ unpack_file 4 &&
+ mv $GLIBC_LIBIDN_DIR libidn
+fi &&
+
if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
patch $SOURCE_DIRECTORY/timezone/Makefile \
@@ -61,7 +72,6 @@ fi &&
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/bug-15014.patch &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
diff --git a/libs/glibc/bug-15014.patch b/libs/glibc/bug-15014.patch
deleted file mode 100644
index be0bf04..0000000
--- a/libs/glibc/bug-15014.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libc-HEAD/sysdeps/i386/dl-tlsdesc.S.org 2008-11-17 18:17:04.004203199
+0100
-+++ libc-HEAD/sysdeps/i386/dl-tlsdesc.S 2008-11-17 18:18:28.029877701
+0100
-@@ -128,8 +128,7 @@
- .Lslow:
- cfi_adjust_cfa_offset (28)
- movl %ebx, 16(%esp)
-- call __i686.get_pc_thunk.bx
-- addl $_GLOBAL_OFFSET_TABLE_, %ebx
-+ LOAD_PIC_REG(bx)
- call ___tls_get_addr@PLT
- movl 16(%esp), %ebx
- jmp .Lret
-




Archive powered by MHonArc 2.6.24.

Top of Page