From 2d2eb5cf3cb8c4a4ceb55c8c3028f0074c020150 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Wed, 1 Sep 2010 20:50:48 +0200
Subject: [PATCH] glibc: removed libidn addon related code in glibc.conf file
 amd the possibility to enable/disable it in the configurator (see note!)

Note:

As of glibc version 2.11 libidn is not an glibc addon anymore, but included
by default!
---
 base/glibc/glibc.conf        | 8 +-------
 base/glibc/subconfig-libc.in | 3 +--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf
index 122d1c00c..9f435c606 100644
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../glibc/glibc.conf
-# Copyright (C) 2006 - 2009 The OpenSDE Project
+# Copyright (C) 2006 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -75,11 +75,6 @@ else
 		var_append extraconfopt " " "--without-tls"
 fi
 
-# ckeck whether to enable libidn support
-if [ $SDECFG_PKG_GLIBC_LIBIDN = 1 ]; then
-	var_append glibc_addons "," "libidn"
-fi
-
 var_append extraconfopt " " "--enable-add-ons=$glibc_addons"
 
 # control whether to include profiling support
@@ -96,7 +91,6 @@ glibc_prepatch() {
 	local tarball= tarname=
 	local addon= addons="ports"
 
-	[ "$SDECFG_PKG_GLIBC_LIBIDN" != '1' ] || var_append addons ' ' 'libidn'
 	##[ "$SDECFG_PKG_GLIBC_TLS" = 1 ] || var_append addons ' ' 'linuxthreads'
 
 	for addon in $addons; do
diff --git a/base/glibc/subconfig-libc.in b/base/glibc/subconfig-libc.in
index 0594836d9..4f7219fa7 100644
--- a/base/glibc/subconfig-libc.in
+++ b/base/glibc/subconfig-libc.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../glibc/subconfig-libc.in
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -23,7 +23,6 @@ comment 'Glibc (GNU C Library) Options'
     esac
 
     bool 'Enable TLS and NPTL' SDECFG_PKG_GLIBC_TLS $tls
-    bool 'Enable LibIDN' SDECFG_PKG_GLIBC_LIBIDN 1
     bool 'Enable profile library' SDECFG_PKG_GLIBC_ENABLE_PROFILE 0
 
 comment ' '