Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1)
  • Date: Mon, 12 Sep 2011 08:44:42 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

libs/glibc/DEPENDS | 4 ++--
libs/glibc/DETAILS | 15 ++++++++-------
libs/glibc/HISTORY | 4 ++++
libs/glibc/PREPARE | 6 +++---
4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

glibc: changed cvs url to git (uses 2.13 branch) (fixes #195)

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

-if [ "$GLIBC_CVS" = "y" ]; then
- depends CVS
+if [ "$GLIBC_GIT" = "y" ]; then
+ depends git
fi &&

if [ "$GLIBC_USEIDN" = "y" ]; then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 926e198..0219656 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -20,17 +20,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
- if [[ "$GLIBC_CVS" == "y" ]]; then
+ if [[ "$GLIBC_GIT" == "y" ]]; then
local GLIBC_VERSION
GLIBC_VERSION=2.13
- if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
+ if [[ "${GLIBC_GIT_AUTOUPDATE}" == "y" ]]; then
+ VERSION=${GLIBC_VERSION}-git-$(date +%Y%m%d)
else
- VERSION=${GLIBC_VERSION}
+ VERSION=${GLIBC_VERSION}-git
fi
- SOURCE=$SPELL-${GLIBC_VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
-
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
+ FORCE_DOWNLOAD=on
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_VERSION}/master"
SOURCE_IGNORE=volatile
else
VERSION=2.13
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7416236..642b1f9 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * PREPARE,DETAILS: changed cvs url to git (uses 2.13 branch) (fixes
#195)
+ * DEPENDS: replaced CVS with git
+
2011-07-25 Ladislav Hagara <hgr AT vabo.cz>
* PREPARE, DETAILS: linux 3 support added

diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 14df969..39ce0cc 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -5,9 +5,9 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) 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 unstable
release (requires cvs)?" n &&
- if [[ "$GLIBC_CVS" == "y" ]]; then
- config_query GLIBC_CVS_AUTOUPDATE "Update cvs repo on every system
update?" n
+ config_query GLIBC_GIT "Do you want to install the latest unstable
(requires git)?" n &&
+ if [[ "$GLIBC_GIT" == "y" ]]; then
+ config_query GLIBC_GIT_AUTOUPDATE "Update on every system update?" n
fi
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1), Bor Kraljič, 09/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page