Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3f11555184bc103bed5d46529ff4e868c6c2e841)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3f11555184bc103bed5d46529ff4e868c6c2e841)
  • Date: Tue, 20 Feb 2007 23:06:55 -0600

GIT changes to master grimoire by Elisamuel Resto
<ryuji AT poseidon.dragonboricua.com>:

libs/glibc/BUILD | 18 ++++++++++++++----
libs/glibc/DEPENDS | 16 ++++++++++------
libs/glibc/DETAILS | 8 ++++++++
libs/glibc/HISTORY | 4 ++++
libs/glibc/PREPARE | 1 +
libs/glibc/PRE_BUILD | 14 ++++++++++++++
6 files changed, 51 insertions(+), 10 deletions(-)

New commits:
commit 3f11555184bc103bed5d46529ff4e868c6c2e841
Author: Elisamuel Resto <ryuji AT poseidon.dragonboricua.com>
Commit: Elisamuel Resto <ryuji AT poseidon.dragonboricua.com>

libs/glibc: Added libidn support as per bug #13465

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 75d6370..1b94e5f 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -25,17 +25,27 @@ export CCACHE_RECACHE=true &&
# End ccache fix
#

+local ADDONS
if [ "$GLIBC_NPTL" = "y" ]; then
- OPTS="$OPTS --enable-add-ons=nptl \
- --with-tls \
+ ADDONS="nptl"
+ OPTS="$OPTS --with-tls \
--enable-kernel=2.6"
else
- OPTS="$OPTS --enable-add-ons=linuxthreads \
- --without-__thread \
+ ADDONS="linuxthreads"
+ OPTS="$OPTS --without-__thread \
--enable-kernel=2.4"
fi &&

#
+# Enable IDN?
+#
+if [ "$GLIBC_USEIDN" = "y" ]; then
+ ADDONS="$ADDONS libidn"
+fi &&
+
+OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}"
+
+#
# Fixes Bug #8595
#
CFLAGS="-Os $CFLAGS" &&
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index a9ba201..b6e2214 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -1,6 +1,10 @@
-depends gcc &&
-depends gettext &&
-depends gnupg &&
-depends perl &&
-depends smgl-fhs &&
-depends smgl-archspecs
+depends gcc &&
+depends gettext &&
+depends gnupg &&
+depends perl &&
+depends smgl-fhs &&
+depends smgl-archspecs &&
+
+if [ "$GLIBC_USEIDN" = "y" ]; then
+ depends libidn
+fi
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 0040ce1..b5776bc 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -8,6 +8,14 @@ if [ "$GLIBC_NPTL" = "y" ]; then
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig

SOURCE3_URL[0]=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/$SOURCE3
+ 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

SOURCE3_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index e7b621b..e5a5c06 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2007-01-21 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Added libidn support
+ as per: http://bugs.sourcemage.org/show_bug.cgi?id=13465
+
2007-01-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DEPENDS: added gcc for proper ordering; avoids some compilation
errors

diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index ffbfcea..aba6486 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -4,6 +4,7 @@ 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
+ 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 a406974..f2c5885 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -6,6 +6,12 @@ default_pre_build &&
persistent_add GLIBC_HEADERS_DIR &&
GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-libc-headers-$HEADERS_VERSION &&

+#
+# Set GLIBC_LIBIDN_DIR for use later
+#
+persistent_add GLIBC_LIBIDN_DIR &&
+GLIBC_LIBIDN_DIR=$SOURCE_DIRECTORY/glibc-libidn-$VERSION &&
+
if [ "$GLIBC_NPTL" = "y" ]; then
cd $SOURCE_DIRECTORY &&
# fix for upstream bug http://sourceware.org/bugzilla/show_bug.cgi?id=2429
@@ -13,6 +19,14 @@ if [ "$GLIBC_NPTL" = "y" ]; then
# fix for upstream bug https://bugzilla.samba.org/show_bug.cgi?id=3678
patch -p1 < $SCRIPT_DIRECTORY/glibc-2.4-iconv_open.patch &&

+ if [ "$GLIBC_USEIDN" = "y" ]; then
+ #
+ # Unpack glibc-libidn
+ #
+ unpack_file 4 &&
+ mv $GLIBC_LIBIDN_DIR libidn
+ fi &&
+
#
# Unpack glibc-kernel-headers
#



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3f11555184bc103bed5d46529ff4e868c6c2e841), Elisamuel Resto, 02/21/2007

Archive powered by MHonArc 2.6.24.

Top of Page