Skip to Content.
Sympa Menu

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

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 (21c60a490fba609e8d57d993f064218659fba252)
  • Date: Thu, 5 Aug 2010 20:06:49 -0500

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

libs/glibc/BUILD | 1 +
libs/glibc/DETAILS | 8 ++++----
libs/glibc/HISTORY | 6 ++++++
libs/glibc/PRE_BUILD | 2 --
libs/glibc/binutils-2.20.patch | 20 --------------------
libs/glibc/glibc.gpg |binary
6 files changed, 11 insertions(+), 26 deletions(-)

New commits:
commit 21c60a490fba609e8d57d993f064218659fba252
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

glibc 2.12.1

without --disable-multi-arch ldconfig segfaults during INSTALL so the
box become broken

key 6F00984E verified for example by
https://launchpad.net/~schwab-linux-m68k , glibc developer

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index e0354ab..71d430b 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -156,5 +156,6 @@ $SOURCE_DIRECTORY/configure --host=$HOST
\
--enable-shared \
--disable-profile \
--with-headers=$GLIBC_HEADERS_DIR/usr/include \
+ --disable-multi-arch \
$OPTS &&
make
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index b596f0e..5212182 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.11.2
+ GLIBC_VERSION=2.12.1
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
@@ -33,18 +33,18 @@ 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.11.2
+ VERSION=2.12.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
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
+ SOURCE_GPG=glibc.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
PATCHLEVEL=0
fi
if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
- HEADERS_VERSION=2.6.34
+ HEADERS_VERSION=2.6.35
SOURCE3=linux-${HEADERS_VERSION}.tar.bz2
SOURCE6=${SOURCE3}.sign
SOURCE6_IGNORE=signature
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8816343..8b172d2 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,9 @@
+2010-08-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
+ * PRE_BUILD, binutils-2.20.patch: removed patch
+ * BUILD: added --disable-multi-arch, ldconfid segfaults with --enable
+ * glibc.gpg: added with key 6F00984E (Andreas Schwab)
+
2010-06-13 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE{6,8}_IGNORE for signatures

diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 7b11ee3..5c94952 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&

-patch $SOURCE_DIRECTORY/configure < $SPELL_DIRECTORY/binutils-2.20.patch &&
-
if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
patch $SOURCE_DIRECTORY/timezone/Makefile \
diff --git a/libs/glibc/binutils-2.20.patch b/libs/glibc/binutils-2.20.patch
deleted file mode 100644
index a80510f..0000000
--- a/libs/glibc/binutils-2.20.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig 2009-10-19 12:57:29.000000000 +0200
-+++ configure 2009-10-19 13:01:02.000000000 +0200
-@@ -4841,6 +4841,8 @@
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 2.1[3-9]*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-+ 2.2[0-9]*)
-+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
- esac
-@@ -4904,6 +4906,8 @@
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 2.1[3-9]*)
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-+ 2.2[0-9]*)
-+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-
- esac
diff --git a/libs/glibc/glibc.gpg b/libs/glibc/glibc.gpg
new file mode 100644
index 0000000..a76e5eb
Binary files /dev/null and b/libs/glibc/glibc.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (21c60a490fba609e8d57d993f064218659fba252), Ladislav Hagara, 08/05/2010

Archive powered by MHonArc 2.6.24.

Top of Page