Author: sthibault
Date: 2015-11-25 02:25:18 +0000 (Wed, 25 Nov 2015)
New Revision: 6705
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/sysdeps/hurd-i386.mk
Log:
* sysdeps/hurd-i386.mk: Disable libc0.3-i686 and libc0.3-xen build for now,
to get 2.21 out against the binutils version which broke them.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-11-25 02:01:28 UTC
(rev 6704)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-11-25 02:25:18 UTC
(rev 6705)
@@ -19,6 +19,8 @@
visibility.
* patches/hurd-i386/cvs-hidden.diff: New patch, to fix build with hidden
support.
+ * sysdeps/hurd-i386.mk: Disable libc0.3-i686 and libc0.3-xen build for now,
+ to get 2.21 out against the binutils version which broke them.
-- Aurelien Jarno <aure...@debian.org> Sun, 22 Nov 2015 20:20:54 +0100
Modified: glibc-package/branches/glibc-2.21/debian/sysdeps/hurd-i386.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/sysdeps/hurd-i386.mk
2015-11-25 02:01:28 UTC (rev 6704)
+++ glibc-package/branches/glibc-2.21/debian/sysdeps/hurd-i386.mk
2015-11-25 02:25:18 UTC (rev 6705)
@@ -1,28 +1,27 @@
-# We use -march=i686 and glibc's i686 routines use cmov, so require it.
-# A Debian-local glibc patch adds cmov to the search path.
-GLIBC_PASSES += i686
-DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686
-i686_add-ons = $(libc_add-ons)
-i686_configure_target=i686-gnu
-i686_extra_cflags = -march=i686 -mtune=generic
-i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
-i686_extra_config_options = $(extra_config_options) --disable-compatible-utmp
-
-# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
-# greatly increase the speed when running under the 32bit Xen hypervisor.
-GLIBC_PASSES += xen
-DEB_ARCH_REGULAR_PACKAGES += libc0.3-xen
-xen_add-ons = $(libc_add-ons)
-xen_configure_target=i686-gnu
-xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
-xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
-xen_extra_config_options = $(extra_config_options)
-
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
-define libc0.3-dev_extra_pkg_install
-mkdir -p debian/libc0.3-dev/$(libdir)/xen
-cp -af debian/tmp-xen/$(libdir)/*.a \
- debian/libc0.3-dev/$(libdir)/xen
-endef
-endif
-
+## We use -march=i686 and glibc's i686 routines use cmov, so require it.
+## A Debian-local glibc patch adds cmov to the search path.
+#GLIBC_PASSES += i686
+#DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686
+#i686_add-ons = $(libc_add-ons)
+#i686_configure_target=i686-gnu
+#i686_extra_cflags = -march=i686 -mtune=generic
+#i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
+#i686_extra_config_options = $(extra_config_options) --disable-compatible-utmp
+#
+## We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
+## greatly increase the speed when running under the 32bit Xen hypervisor.
+#GLIBC_PASSES += xen
+#DEB_ARCH_REGULAR_PACKAGES += libc0.3-xen
+#xen_add-ons = $(libc_add-ons)
+#xen_configure_target=i686-gnu
+#xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
+#xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
+#xen_extra_config_options = $(extra_config_options)
+#
+#ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+#define libc0.3-dev_extra_pkg_install
+#mkdir -p debian/libc0.3-dev/$(libdir)/xen
+#cp -af debian/tmp-xen/$(libdir)/*.a \
+# debian/libc0.3-dev/$(libdir)/xen
+#endef
+#endif
