Author: dan
Date: 2005-11-13 00:17:49 +0000 (Sun, 13 Nov 2005)
New Revision: 1058

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules
   glibc-package/trunk/debian/rules.d/build.mk
Log:
  * Re-enable libidn (Closes: #181025).


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2005-11-13 00:07:15 UTC (rev 
1057)
+++ glibc-package/trunk/debian/changelog        2005-11-13 00:17:49 UTC (rev 
1058)
@@ -11,8 +11,9 @@
   * Remove obsolete mountkernfs, tmpfs, and devpts.sh files from debian/.
   * Temporarily set hppa back to gcc 3.4, from Steve Langasek
     (Closes: #326581).
+  * Re-enable libidn (Closes: #181025).
 
- -- Daniel Jacobowitz <[EMAIL PROTECTED]>  Sat, 12 Nov 2005 19:06:15 -0500
+ -- Daniel Jacobowitz <[EMAIL PROTECTED]>  Sat, 12 Nov 2005 19:15:29 -0500
 
 glibc (2.3.5-7) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules    2005-11-13 00:07:15 UTC (rev 1057)
+++ glibc-package/trunk/debian/rules    2005-11-13 00:17:49 UTC (rev 1058)
@@ -128,6 +128,9 @@
 fi)
 endef
 
+# Include libidn for both NPTL and LinuxThreads targets.
+standard-add-ons = libidn,
+
 # Pull in all the per-arch magic!
 
 -include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk

Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2005-11-13 00:07:15 UTC (rev 
1057)
+++ glibc-package/trunk/debian/rules.d/build.mk 2005-11-13 00:17:49 UTC (rev 
1058)
@@ -58,7 +58,8 @@
                $(CURDIR)/$(DEB_SRCDIR)/configure \
                --host=$(call xx,configure_target) \
                --build=$$configure_build --prefix=/usr --without-cvs \
-               --enable-add-ons="$(call xx,add-ons)" --without-selinux \
+               --enable-add-ons=$(standard-add-ons)"$(call xx,add-ons)" \
+               --without-selinux \
                $(call xx,with_headers) $(call xx,extra_config_options))
 
        touch $@


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to