Skip to Content.
Sympa Menu

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

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 (6841f3fb2508a93ffac4a0bd9cc88c33c27c5687)
  • Date: Wed, 29 Oct 2008 09:54:38 -0500

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

libs/glibc/DEPENDS | 4 ++++
libs/glibc/DETAILS | 43 ++++++++++++++++++++++++++++---------------
libs/glibc/HISTORY | 3 +++
libs/glibc/PREPARE | 6 ++++++
libs/glibc/PRE_BUILD | 10 ++++++----
5 files changed, 47 insertions(+), 19 deletions(-)

New commits:
commit 6841f3fb2508a93ffac4a0bd9cc88c33c27c5687
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

glibc 2.8 from CVS #14831

diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index 58087ea..9367123 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -7,6 +7,10 @@ depends smgl-fhs &&
depends smgl-archspecs &&
optional_depends libselinux '--with-selinux' '--without-selinux' 'for
selinux support' &&

+if [ "$GLIBC_CVS" = "y" ]; then
+ depends CVS
+fi &&
+
if [ "$GLIBC_USEIDN" = "y" ]; then
depends libidn
fi
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index e6480d2..180a690 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -3,6 +3,7 @@ if [ "$GLIBC_NPTL" = "n" ]; then
VERSION=2.3.6
HEADERS_VERSION=2.4.24
SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2=$SOURCE.sig
SOURCE3=glibc-linuxthreads-$VERSION.tar.bz2
SOURCE4=$SOURCE3.sig
@@ -19,10 +20,36 @@ if [ "$GLIBC_NPTL" = "n" ]; then

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
+ if [[ "$GLIBC_CVS" == "y" ]]; then
+ if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
+ VERSION=2.8-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
+ else
+ VERSION=2.8
+ fi
+ SOURCE=$SPELL-2.8.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-2.8
+
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-2_8-branch
+ SOURCE_IGNORE=volatile
+ else
VERSION=2.7
- HEADERS_VERSION=2.6.25
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
+ 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
+ SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+ PATCHLEVEL=2
+ fi
+ HEADERS_VERSION=2.6.25
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32)
SOURCE3=linux-headers-${HEADERS_VERSION}-x86.tar.bz2
@@ -62,23 +89,9 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
return 222
;;
esac
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig

SOURCE3_URL[0]=http://download.sourcemage.org/distro/kernel/headers/$SOURCE3
SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
- 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
- SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- PATCHLEVEL=2
fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
LICENSE[1]=LGPL
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 23ba8f9..1700090 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2008-10-29 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.8 from CVS #14831
+
2008-10-13 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply localtime.patch for NPTL-based glibc
* localtime.patch: Do not overwrite /etc/localtime
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index aba6486..71735ee 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -4,6 +4,12 @@ if [[ $(uname -r) = 2.6.* ]]; then
config_set_option GLIBC_NPTL n
else
config_query GLIBC_NPTL "As you are running a 2.6 kernel, would you
like to use the new nptl (Native Posix Thread Libary)?" y
+ if [[ "$GLIBC_NPTL" == "y" ]]; then
+ config_query GLIBC_CVS "Do you want to install the latest stable
release 2.8 (requires cvs)?" n
+ if [[ "$GLIBC_CVS" == "y" ]]; then
+ config_query GLIBC_CVS_AUTOUPDATE "Update cvs repo on every system
update?" n
+ fi
+ fi
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y
fi
fi &&
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index efdd22b..afdf138 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -11,7 +11,7 @@ if [ "$GLIBC_NPTL" = "y" ]; then
patch $SOURCE_DIRECTORY/timezone/Makefile \
$SCRIPT_DIRECTORY/localtime.patch &&

- if [ "$GLIBC_USEIDN" = "y" ]; then
+ if [ "$GLIBC_USEIDN" = "y" ] && [[ "$GLIBC_CVS" != "y" ]]; then
#
# Unpack glibc-libidn
#
@@ -62,9 +62,11 @@ patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&
# Fix for GCC 4.3.0
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=5442
#
-patch $SOURCE_DIRECTORY/configure.in \
- $SCRIPT_DIRECTORY/gcc43.patch &&
-autoconf &&
+if [[ "$GLIBC_CVS" != "y" ]]; then
+ patch $SOURCE_DIRECTORY/configure.in \
+ $SCRIPT_DIRECTORY/gcc43.patch &&
+ autoconf
+fi &&

# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6841f3fb2508a93ffac4a0bd9cc88c33c27c5687), Ladislav Hagara, 10/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page