diff options
author | Eric Sandall | 2007-05-13 14:05:35 -0700 |
---|---|---|
committer | David Brown | 2007-09-23 23:04:46 -0700 |
commit | 6558ebd77026ead19a61a710193e66cbfe88ba0d (patch) | |
tree | e58c9d863f7cfed73b1606ff4cb4a1a650692123 | |
parent | 5f64b4da1a9cf6e883043bd7f0698ff859f3d79c (diff) |
glibc: Fix building IDN to only build with NPTL (Bug #13771)
-rwxr-xr-x | libs/glibc/BUILD | 14 | ||||
-rw-r--r-- | libs/glibc/HISTORY | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD index 1b94e5f784..1d3bd37008 100755 --- a/libs/glibc/BUILD +++ b/libs/glibc/BUILD @@ -27,6 +27,13 @@ export CCACHE_RECACHE=true && local ADDONS if [ "$GLIBC_NPTL" = "y" ]; then + # + # Enable IDN? + # + if [ "$GLIBC_USEIDN" = "y" ]; then + ADDONS="$ADDONS libidn" + fi && + ADDONS="nptl" OPTS="$OPTS --with-tls \ --enable-kernel=2.6" @@ -36,13 +43,6 @@ else --enable-kernel=2.4" fi && -# -# Enable IDN? -# -if [ "$GLIBC_USEIDN" = "y" ]; then - ADDONS="$ADDONS libidn" -fi && - OPTS="$OPTS --enable-add-ons=${ADDONS/ /,}" # diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 58b6705c6c..5aac164e07 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,3 +1,6 @@ +2007-05-13 Eric Sandall <sandalle@sourcemage.org> + * BUILD: Only enable IDN if using a NPTL build (Bug #13771) + 2007-05-05 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * PRE_BUILD: remove an useless persistent var (epilogue of #13465) |