r1859 - in glibc-package/branches/glibc-2.5/debian: . sysdeps
Author: aurel32
Date: 2006-10-19 17:07:24 +0000 (Thu, 19 Oct 2006)
New Revision: 1859
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/sysdeps/i386.mk
Log:
Revert this change:
* sysdeps/i386.mk: ship the Xen flavour of ldconfig in libc6. It should be
a few percent slower on plain i386, but a lot faster on Xen i386.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-19 07:18:27 UTC (rev 1858)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-19 17:07:24 UTC (rev 1859)
@@ -28,8 +28,6 @@
* debhelper.in/libc.docs: remove INTERFACE as it has been removed upstream.
* sysdeps/depflags.pl: don't make libc6 depends on tzdata, as this package
is of priority required. Should help to debconfize tzdata.
- * sysdeps/i386.mk: ship the Xen flavour of ldconfig in libc6. It should be
- a few percent slower on plain i386, but a lot faster on Xen i386.
* sysdeps/i386.mk: put the static Xen libc flavour in /usr/lib/xen. Closes:
#391372.
* sysdeps/powerpc.mk: install 64-bit headers (actually gnu/stubs-64.h)
Modified: glibc-package/branches/glibc-2.5/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/sysdeps/i386.mk 2006-10-19 07:18:27 UTC (rev 1858)
+++ glibc-package/branches/glibc-2.5/debian/sysdeps/i386.mk 2006-10-19 17:07:24 UTC (rev 1859)
@@ -63,10 +63,6 @@
cp debian/tmp-amd64/usr/bin/ldd debian/tmp-libc/usr/bin
endef
-define xen_extra_install
-cp debian/tmp-xen/sbin/ldconfig debian/tmp-libc/sbin
-endef
-
define libc6-dev_extra_pkg_install
mkdir -p debian/libc6-dev/usr/lib/xen
cp -af debian/tmp-xen/usr/lib/*.a \
Reply to: