Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (74b825f76b4857af454b027837754d515705994c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (74b825f76b4857af454b027837754d515705994c)
  • Date: Sat, 22 Nov 2008 14:05:06 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/glibc/BUILD | 9 ++++++++
libs/glibc/DETAILS | 42
++++++++++++++++++++++++++++----------
libs/glibc/HISTORY | 16 ++++++++++++++
libs/glibc/Neumeier.gpg |binary
libs/glibc/PREPARE | 12 ++++++----
libs/glibc/PRE_BUILD | 39 ++++++++++++++++-------------------
libs/glibc/fnstsw.patch | 11 ---------
libs/glibc/gcc43.patch | 26 -----------------------
python-pypi/kinterbasdb/DETAILS | 9 ++++----
python-pypi/kinterbasdb/HISTORY | 5 ++++
python-pypi/kinterbasdb/PRE_BUILD | 3 ++
11 files changed, 95 insertions(+), 77 deletions(-)

New commits:
commit cd5ee1a7ca588b45080a371d34bfa125111e23f3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"glibc-2.9"

commit dc0d303c2536cc4b572a8a2c4caffd4e9e154c07
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

"kinterbasdb-3.3.0-pre"

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 667f72c..4f3fd7e 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -67,6 +67,15 @@ unset LD_LIBRARY_PATH &&
# Setup sanitised glibc-kernel-headers for the glibc compile
# ...as well as other arch-dependend specialties
#
+if [[ ${GLIBC_NPTL} == y ]] && [[ ${GLIBC_SANITIZE_HEADERS} == y ]]; then
+ cd ${GLIBC_HEADERS_DIR} &&
+ if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]] && [[ ${SMGL_COMPAT_ARCHS[1]} ==
sparc ]]; then
+ make ARCH=sparc64 INSTALL_HDR_PATH=usr headers_install
+ else
+ make ARCH=${SMGL_COMPAT_ARCHS[1]} INSTALL_HDR_PATH=usr headers_install
+ fi
+fi
+
if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]];
then
#
# If we're not compiling for 64-bit SPARC then we need to use the sparc
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 180a690..439bf69 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -21,22 +21,24 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
PATCHLEVEL=1
else
if [[ "$GLIBC_CVS" == "y" ]]; then
+local GLIBC_VERSION
+ GLIBC_VERSION=2.9
if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
- VERSION=2.8-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
+ VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
else
- VERSION=2.8
+ VERSION=${GLIBC_VERSION}
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=$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
SOURCE_IGNORE=volatile
else
- VERSION=2.7
+ VERSION=2.9
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
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://toolchain.freesa.org/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
if [ "$GLIBC_USEIDN" = "y" ]; then
SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
SOURCE5=$SOURCE4.sig
@@ -45,10 +47,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE4_GPG=gnu.gpg:$SOURCE4.sig:UPSTREAM_KEY
SOURCE5_IGNORE=signature
fi
- SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE_GPG=Neumeier.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
PATCHLEVEL=2
fi
+ if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
HEADERS_VERSION=2.6.25
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32)
@@ -91,6 +94,25 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
esac

SOURCE3_URL[0]=http://download.sourcemage.org/distro/kernel/headers/$SOURCE3
SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
+ else
+ local LINUX_DIRECTORY
+ LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
+ . $LINUX_DIRECTORY/latest.defaults
+ HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
+ HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
+ SOURCE3=linux-${LATEST_2_6}.tar.bz2
+ SOURCE6="${SOURCE3}.sign"
+ SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURC3}"
+ SOURCE6_URL="${SOURCE3_URL}.sign"
+ if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
+ SOURCE7=patch-${HEADERS_VERSION}.bz2
+ SOURCE8="${SOURCE7}.sign"
+ SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
+ SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
+ SOURCE8_URL="${SOURCE7_URL}.sign"
+ fi
+ fi
fi
WEB_SITE=http://www.gnu.org/software/libc
LICENSE[0]=LGPL
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 6cff206..5f37bfd 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,19 @@
+2008-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9
+ new url
+ * Neumeier.gpg: added
+ * PREPARE: change query text
+ * PRE_BUILD: don't apply gcc43.patch, fnstsw.patch
+ * gcc43.patch, fnstsw.patch: deleted, now included upstream
+
+2008-11-22 Fredrik Carlstr�m <fredrik.carlstrom AT tele2.se>
+ * DETAILS: update cvs version to latest stable (2.9)
+ optionally use sanitized kernel headers
+ fixes bug #14897
+ * PREPARE: update cvs query
+ query for sanitized kernel headers
+ * BUILD, PRE_BUILD: adapt for sanitized kernel headers
+
2008-11-07 : Julien "_kaze_" ROZO <julien AT rozo.org>
* fnstsw.patch: added, fix asm compilation issue for version 2.7
with latest binutils
diff --git a/libs/glibc/Neumeier.gpg b/libs/glibc/Neumeier.gpg
new file mode 100644
index 0000000..34d83dd
Binary files /dev/null and b/libs/glibc/Neumeier.gpg differ
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 71735ee..c9bbbe9 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -1,19 +1,21 @@
if [[ $(uname -r) = 2.6.* ]]; then
if test "$HOST" == "i386-pc-linux-gnu"; then
- message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]"
+ message "[[ ${QUERY_COLOR}Not building with NPTL as that's unsupported
on i386; use i486 or higher.${DEFAULT} ]]" &&
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
+ 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
+ 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
fi
- fi
- config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y
+ fi &&
+ config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
+ config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
fi
fi &&

if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
config_query GLIBC_NOLIB64 "Shall the dynamic linker install to /lib (not
/lib64) (lib64 purge part 2 of 2)?" n
fi
+
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 9321bcc..684c617 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -29,9 +29,24 @@ if [ "$GLIBC_NPTL" = "y" ]; then
GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2} &&

unpack_file 3 &&
- cd $GLIBC_HEADERS_DIR/usr/include &&
- chmod -R +r * &&
- find . -type d -exec chmod +x '{}' ';'
+ if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
+ cd $GLIBC_HEADERS_DIR/usr/include &&
+ chmod -R +r * &&
+ find . -type d -exec chmod +x '{}' ';'
+ else
+ cd $GLIBC_HEADERS_DIR &&
+ if [ ! -z $SOURCE7 ]; then
+ verify_file 7 || return 1 &&
+ bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7%.bz2} &&
+ message "${MESSAGE_COLOR}Patching ${!patch}${DEFAULT_COLOR}" &&
+ patch -p1 < ${SOURCE7%.bz2} &&
+ if [[ $? != 0 ]]; then
+ message "${PROBLEM_COLOR}Patch ${!patch} failed${DEFAULT_COLOR}" &&
+ return 1
+ fi
+ fi &&
+ make mrproper
+ fi
else
cd $SOURCE_DIRECTORY &&
#
@@ -58,24 +73,6 @@ cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch &&
patch -p1 < $SCRIPT_DIRECTORY/as-test-x.patch &&

-#
-# Fix for GCC 4.3.0
-# http://sources.redhat.com/bugzilla/show_bug.cgi?id=5442
-#
-if [[ "$GLIBC_CVS" != "y" ]]; then
- patch $SOURCE_DIRECTORY/configure.in \
- $SCRIPT_DIRECTORY/gcc43.patch &&
- autoconf
-fi &&
-
-#
-# Fix for fnstsw asm issue with latest binutils
-# http://sourceware.org/ml/binutils/2008-01/msg00151.html
-#
-if [[ "$GLIBC_CVS" != "y" ]]; then
- patch -p1 < $SCRIPT_DIRECTORY/fnstsw.patch
-fi &&
-
# disabled libgd detection/building memusagestat for now until a better
# fix has been found, bug #8277
sedit 's/LIBGD=yes/LIBGD=no/' $SOURCE_DIRECTORY/configure &&
diff --git a/libs/glibc/fnstsw.patch b/libs/glibc/fnstsw.patch
deleted file mode 100644
index 89a71f6..0000000
--- a/libs/glibc/fnstsw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.7.old/sysdeps/i386/fpu/ftestexcept.c 2004-03-05
11:14:48.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/fpu/ftestexcept.c 2008-11-07 23:45:48.000000000
+0100
-@@ -26,7 +26,7 @@
- int
- fetestexcept (int excepts)
- {
-- int temp;
-+ short temp;
- int xtemp = 0;
-
- /* Get current exceptions. */
diff --git a/libs/glibc/gcc43.patch b/libs/glibc/gcc43.patch
deleted file mode 100644
index 9404219..0000000
--- a/libs/glibc/gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-2007-03-18 Joseph Myers <joseph AT codesourcery.com>
-
- * configure.in: Also pass -isystem option for GCC's include-fixed
- directory.
- * configure: Regenerate.
-
-Index: configure.in
-===================================================================
-RCS file: /cvs/glibc/libc/configure.in,v
-retrieving revision 1.468
-diff -u -r1.468 configure.in
---- configure.in 17 Mar 2007 17:01:46 -0000 1.468
-+++ configure.in 18 Mar 2007 20:35:03 -0000
-@@ -912,7 +912,7 @@
- # thing on a system that doesn't need fixincludes. (Not presently a
problem.)
- if test -n "$sysheaders"; then
- ccheaders=`$CC -print-file-name=include`
-- SYSINCLUDES="-nostdinc -isystem $ccheaders \
-+ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
- if test -n "$CXX"; then
- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
-
---
-Joseph S. Myers
-joseph AT codesourcery.com
diff --git a/python-pypi/kinterbasdb/DETAILS b/python-pypi/kinterbasdb/DETAILS
index 71acc3b..dc82222 100755
--- a/python-pypi/kinterbasdb/DETAILS
+++ b/python-pypi/kinterbasdb/DETAILS
@@ -1,9 +1,10 @@
SPELL=kinterbasdb
WEB_SITE=http://www.firebirdsql.org/
- VERSION=3.2.2
-
SOURCE_HASH=sha512:280b7472d47c41c16fa4af3bf89aa64556fc794eb41c304b89ed349a9840b1817937eed786333361079628018de6ae40159e6408b890df99ac0ba47519a312e3
- URI=$SOURCEFORGE_URL/firebird
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=3.3.0-pre
+
SOURCE_HASH=sha512:582f8583dd9a9899c2bfbf70cb52ff895ff62c53354c2b8342b37e774d765bf285a81f9acb787d6247cd1122c8b5d88750c189c053c555cb12d1c6e3975360fc
+# URI=$SOURCEFORGE_URL/firebird
+ URI=http://www.firebirdsql.org/download/prerelease/python/
+ SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$URI/$SOURCE
LICENSE=BSD
diff --git a/python-pypi/kinterbasdb/HISTORY b/python-pypi/kinterbasdb/HISTORY
index 64eaeb6..d06337d 100755
--- a/python-pypi/kinterbasdb/HISTORY
+++ b/python-pypi/kinterbasdb/HISTORY
@@ -1,3 +1,8 @@
+2008-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.0-pre
+ new url
+ * PRE_BUILD: added
+
2008-08-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.2.2

diff --git a/python-pypi/kinterbasdb/PRE_BUILD
b/python-pypi/kinterbasdb/PRE_BUILD
new file mode 100755
index 0000000..fee3737
--- /dev/null
+++ b/python-pypi/kinterbasdb/PRE_BUILD
@@ -0,0 +1,3 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file




Archive powered by MHonArc 2.6.24.

Top of Page