summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2007-08-06 09:31:53 +0200
committerDavid Brown2007-09-23 23:05:26 -0700
commit0a6055f7d09de171f334c2cb221b8fafe39311b5 (patch)
tree25e03016ecb411dedcb5919000dc9017c1890fda
parent570872a98e14a431066d13e318b3100f827bb97f (diff)
glibc - fix bug #13925
-rwxr-xr-xlibs/glibc/BUILD4
-rw-r--r--libs/glibc/HISTORY3
2 files changed, 5 insertions, 2 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index c674015d4f..38cfaee172 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -26,6 +26,7 @@ export CCACHE_RECACHE=true &&
#
local ADDONS
+ADDONS="nptl" &&
if [ "$GLIBC_NPTL" = "y" ]; then
#
# Enable IDN?
@@ -34,7 +35,6 @@ if [ "$GLIBC_NPTL" = "y" ]; then
ADDONS="$ADDONS libidn"
fi &&
- ADDONS="nptl"
OPTS="$OPTS --with-tls \
--enable-kernel=2.6"
else
@@ -43,7 +43,7 @@ else
--enable-kernel=2.4"
fi &&
-OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}"
+OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}" &&
#
# Fixes Bug #8595
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5f40efc4b4..c6da422856 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2007-08-06 Treeve Jelbert <treeve@sourcemage.org>
+ * BUILD: fix broken libidn (bug #13925)
+
2007-05-13 Eric Sandall <sandalle@sourcemage.org>
* BUILD: Only enable IDN if using a NPTL build (Bug #13771)